Changes ;)

[kiosk.git] / renderer_catalog.py

diff --git a/renderer_catalog.py b/renderer_catalog.py
index 6eccb6ebab3fbb8e9b49ba6bac44568f1e7a484b..fe11e3287b7b7f1bfa47062d5c236038bb99870b 100644 (file)
--- a/renderer_catalog.py
+++ b/renderer_catalog.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import bellevue_city_calendar_renderer
 import bellevue_reporter_rss_renderer
 import constants
 import cnn_rss_renderer
@@ -14,11 +15,12 @@ import myq_renderer
 import reddit_renderer
 import renderer
 import seattletimes_rss_renderer
-import secrets
+import kiosk_secrets as secrets
 import stevens_renderer
 import stranger_renderer
 import stock_renderer
 import twitter_renderer
+import urbanist_renderer
 import weather_renderer
 import wsj_rss_renderer
 
@@ -29,17 +31,7 @@ hours = constants.seconds_per_hour
 always = seconds * 1
 
 
-oauth = gdata_oauth.OAuth(secrets.google_client_id, secrets.google_client_secret)
-if not oauth.has_token():
-    user_code = oauth.get_user_code()
-    print("------------------------------------------------------------")
-    print(
-        (
-            'Go to %s and enter the code "%s" (no quotes, case-sensitive)'
-            % (oauth.verification_url, user_code)
-        )
-    )
-    oauth.get_new_token()
+oauth = gdata_oauth.OAuth(secrets.google_client_secret)
 
 
 # Note, the 1s updates don't really update every second; there's a max
@@ -52,12 +44,27 @@ __registry = [
     myq_renderer.garage_door_renderer(
         {"Poll MyQ": (minutes * 5), "Update Page": (always)}
     ),
+    bellevue_city_calendar_renderer.bellevue_city_calendar_renderer(
+        {
+            "Fetch News": (hours * 1),
+            "Shuffle News": (always),
+        },
+        'bellevuewa.gov',
+        [ '/calendar/events.xml' ],
+        'Bellevue City Calendar'
+    ),
     bellevue_reporter_rss_renderer.bellevue_reporter_rss_renderer(
         {"Fetch News": (hours * 1), "Shuffle News": (always)},
         "www.bellevuereporter.com",
         ["/feed/"],
         "Bellevue Reporter",
     ),
+    urbanist_renderer.urbanist_renderer(
+        {'Fetch News': (hours * 2), 'Shuffle News': (always)},
+        'www.theurbanist.org',
+        ['/feed/'],
+        'TheUrbanist',
+    ),
     mynorthwest_rss_renderer.mynorthwest_rss_renderer(
         {"Fetch News": (hours * 1), "Shuffle News": (always)},
         "mynorthwest.com",
@@ -128,13 +135,13 @@ __registry = [
         "Seattle Times Segments",
     ),
     weather_renderer.weather_renderer(
-        {"Fetch Weather (Bellevue)": (hours * 6)}, "home"
+        {"Fetch Weather (Bellevue)": (hours * 3)}, "home"
     ),
     weather_renderer.weather_renderer(
-        {"Fetch Weather (Stevens)": (hours * 6)}, "stevens"
+        {"Fetch Weather (Stevens)": (hours * 3)}, "stevens"
     ),
     weather_renderer.weather_renderer(
-        {"Fetch Weather (Telma)": (hours * 6)}, "telma"),
+        {"Fetch Weather (Telma)": (hours * 3)}, "telma"),
     local_photos_mirror_renderer.local_photos_mirror_renderer(
         {"Index Photos": (hours * 24), "Choose Photo": (always)}
     ),