X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=gcal_renderer.py;h=1e026cd2e11797ae496dabcba5ec3c3e07f7a874;hb=86f7e14f34b43ed8eb8cf5eaf113a4ecca976327;hp=19b818d8ad3309890eff6ef0d7f7b4b21ba63aed;hpb=6b8d4eeb7153617221f822a243a117f0bcab07bf;p=kiosk.git

diff --git a/gcal_renderer.py b/gcal_renderer.py
index 19b818d..1e026cd 100644
--- a/gcal_renderer.py
+++ b/gcal_renderer.py
@@ -13,7 +13,7 @@ from dateutil.parser import parse
 import gdata_oauth
 import pytz
 
-import constants
+import kiosk_constants
 import file_writer
 import globals
 import renderer
@@ -282,9 +282,9 @@ f"""
                     x = int(delta.total_seconds())
                     if x > 0:
                         identifier = "id%d" % count
-                        days = divmod(x, constants.seconds_per_day)
-                        hours = divmod(days[1], constants.seconds_per_hour)
-                        minutes = divmod(hours[1], constants.seconds_per_minute)
+                        days = divmod(x, kiosk_constants.seconds_per_day)
+                        hours = divmod(days[1], kiosk_constants.seconds_per_hour)
+                        minutes = divmod(hours[1], kiosk_constants.seconds_per_minute)
                         g.write(
                             f'<li><SPAN id="%s">%d days, %02d:%02d</SPAN> until %s</li>\n'
                             % (
@@ -342,15 +342,14 @@ var fn = setInterval(function() {
                 )
             return True
         except Exception as e:
+            logger.exception(e)
             print("********* TRYING TO REFRESH GCAL CLIENT *********")
 #            self.oauth.refresh_token()
 #            self.client = self.oauth.calendar_service()
             return False
-        except:
-            raise
 
     def look_for_triggered_events(self) -> bool:
-        with file_writer.file_writer(constants.gcal_imminent_pagename) as f:
+        with file_writer.file_writer(kiosk_constants.gcal_imminent_pagename) as f:
             f.write("<h1>Imminent Upcoming Calendar Events:</h1>\n<hr>\n")
             f.write("<center><table width=99%>\n")
             now = datetime.datetime.now(pytz.timezone("US/Pacific"))
@@ -358,13 +357,13 @@ var fn = setInterval(function() {
             for event in self.sortable_events:
                 eventstamp = event.start_time
                 if eventstamp is None:
-                    return False
+                    continue
                 delta = eventstamp - now
                 x = int(delta.total_seconds())
-                if x > 0 and x <= constants.seconds_per_minute * 3:
-                    days = divmod(x, constants.seconds_per_day)
-                    hours = divmod(days[1], constants.seconds_per_hour)
-                    minutes = divmod(hours[1], constants.seconds_per_minute)
+                if x > -120 and x <  4 * kiosk_constants.seconds_per_minute:
+                    days = divmod(x, kiosk_constants.seconds_per_day)
+                    hours = divmod(days[1], kiosk_constants.seconds_per_hour)
+                    minutes = divmod(hours[1], kiosk_constants.seconds_per_minute)
                     eventstamp = event.start_time
                     name = event.friendly_name()
                     calendar = event.calendar