ensure now is set each time in trigger task loop; see #149

Author: craigbarratt

custom_components/pyscript/trigger.py

@@ -667,7 +667,7 @@ def timer_active_check(cls, time_spec, now, startup_time):
                 results["+"].append(this_match)
 
         # An empty spec, or only neg specs, is True
-        result = any(results["+"]) if results["+"] else True and all(results["-"])
+        result = (any(results["+"]) if results["+"] else True) and all(results["-"])
 
         return result
 
@@ -927,6 +927,9 @@ async def trigger_watch(self):
                 state_trig_timeout = False
                 notify_info = None
                 notify_type = None
+                now = dt_now()
+                if startup_time is None:
+                    startup_time = now
                 if self.run_on_startup:
                     #
                     # first time only - skip waiting for other triggers
@@ -947,9 +950,6 @@ async def trigger_watch(self):
                     check_state_expr_on_start = False
                 else:
                     if self.time_trigger:
-                        now = dt_now()
-                        if startup_time is None:
-                            startup_time = now
                         time_next = TrigTime.timer_trigger_next(self.time_trigger, now, startup_time)
                         _LOGGER.debug(
                             "trigger %s time_next = %s, now = %s", self.name, time_next, now,
@@ -969,15 +969,19 @@ async def trigger_watch(self):
                                 self.notify_q.get(), timeout=timeout
                             )
                             state_trig_timeout = False
+                            now = dt_now()
                         except asyncio.TimeoutError:
+                            now += dt.timedelta(seconds=timeout)
                             if not state_trig_timeout:
+                                notify_type = "time"
                                 notify_info = {
                                     "trigger_type": "time",
                                     "trigger_time": time_next,
                                 }
                     elif self.have_trigger:
                         _LOGGER.debug("trigger %s waiting for state change or event", self.name)
                         notify_type, notify_info = await self.notify_q.get()
+                        now = dt_now()
                     else:
                         _LOGGER.debug("trigger %s finished", self.name)
                         return
@@ -1094,10 +1098,6 @@ async def trigger_watch(self):
                         self.active_expr.get_logger().error(exc)
                         trig_ok = False
                 if trig_ok and self.time_active:
-                    if now is None:
-                        now = dt_now()
-                        if startup_time is None:
-                            startup_time = now
                     trig_ok = TrigTime.timer_active_check(self.time_active, now, startup_time)
 
                 if not trig_ok: