From 59b15a6908907c150adbac18814c782ce927209e Mon Sep 17 00:00:00 2001 From: Tarunpreet Ubhi Date: Sun, 12 Apr 2020 11:38:19 -0700 Subject: [PATCH] Fixed bug in get_frequency Issue reported by mark --- apps/alexa_talking_clock/alexa_talking_clock.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/alexa_talking_clock/alexa_talking_clock.py b/apps/alexa_talking_clock/alexa_talking_clock.py index fe95394..8876e8d 100644 --- a/apps/alexa_talking_clock/alexa_talking_clock.py +++ b/apps/alexa_talking_clock/alexa_talking_clock.py @@ -34,10 +34,12 @@ def initialize(self): self.frequency = self.get_frequency() self.next_start = self.get_next_start() - self.log("INITIALIZE start:" + str(self.next_start) + ", frequency:" + str(self.frequency.interval) + ", times:" + str(self.frequency.announce_times)) + if self.frequency.interval is None: + raise Exception("ERROR: No announce frequency defined. Please set at least one frequency interval") - if self.frequency.interval is not None: - self.run_every(self.time_announce, self.next_start, (60 * self.frequency.interval)) + self.run_every(self.time_announce, self.next_start, (60 * self.frequency.interval)) + + self.log("INITIALIZED: Start " + str(self.next_start.strftime("%H:%M:%S")) + ", Frequency " + str(self.frequency.interval) + ", Times " + str(self.frequency.announce_times)) def get_frequency(self): @@ -74,6 +76,7 @@ def get_next_start(self): for min in self.frequency.announce_times: if now.minute < min: next_start_min = min + break if next_start_min is None: next = now.replace(minute = 0, second = 0) + datetime.timedelta(hours=1)