Various changes including adding new stevens renderer.

[kiosk.git] / renderer_catalog.py

diff --git a/renderer_catalog.py b/renderer_catalog.py
index fe11e3287b7b7f1bfa47062d5c236038bb99870b..c62b926cf9cfcc8c0a4881af473745d5609b5d05 100644 (file)
--- a/renderer_catalog.py
+++ b/renderer_catalog.py
@@ -2,7 +2,7 @@
 
 import bellevue_city_calendar_renderer
 import bellevue_reporter_rss_renderer
-import constants
+import kiosk_constants
 import cnn_rss_renderer
 import gdata_oauth
 import gcal_renderer
@@ -13,11 +13,9 @@ import local_photos_mirror_renderer
 import mynorthwest_rss_renderer
 import myq_renderer
 import reddit_renderer
-import renderer
 import seattletimes_rss_renderer
-import kiosk_secrets as secrets
 import stevens_renderer
-import stranger_renderer
+import kiosk_secrets as secrets
 import stock_renderer
 import twitter_renderer
 import urbanist_renderer
@@ -27,7 +25,7 @@ import wsj_rss_renderer
 
 seconds = 1
 minutes = 60
-hours = constants.seconds_per_hour
+hours = kiosk_constants.seconds_per_hour
 always = seconds * 1
 
 
@@ -38,9 +36,9 @@ oauth = gdata_oauth.OAuth(secrets.google_client_secret)
 # frequency in the renderer thread of ~once a minute.  It just means that
 # everytime it check these will be stale and happen.
 __registry = [
-    stranger_renderer.stranger_events_renderer(
-        {"Fetch Events": (hours * 12), "Shuffle Events": (always)}
-    ),
+#    stranger_renderer.stranger_events_renderer(
+#        {"Fetch Events": (hours * 12), "Shuffle Events": (always)}
+#    ),
     myq_renderer.garage_door_renderer(
         {"Poll MyQ": (minutes * 5), "Update Page": (always)}
     ),
@@ -50,7 +48,7 @@ __registry = [
             "Shuffle News": (always),
         },
         'bellevuewa.gov',
-        [ '/calendar/events.xml' ],
+        ['/calendar/events.xml'],
         'Bellevue City Calendar'
     ),
     bellevue_reporter_rss_renderer.bellevue_reporter_rss_renderer(
@@ -63,7 +61,7 @@ __registry = [
         {'Fetch News': (hours * 2), 'Shuffle News': (always)},
         'www.theurbanist.org',
         ['/feed/'],
-        'TheUrbanist',
+        'The Urbanist',
     ),
     mynorthwest_rss_renderer.mynorthwest_rss_renderer(
         {"Fetch News": (hours * 1), "Shuffle News": (always)},
@@ -95,6 +93,9 @@ __registry = [
         ["/rss/RSSMarketsMain.xml", "/rss/WSJcomUSBusiness.xml"],
         "WSJBusiness",
     ),
+    stevens_renderer.stevens_renderer(
+        {'Unused': (minutes * 30)}
+    ),
     google_news_rss_renderer.google_news_rss_renderer(
         {"Fetch News": (minutes * 30), "Shuffle News": (always)},
         "news.google.com",
@@ -123,11 +124,6 @@ __registry = [
         { "BTC-USD": "BTC",
           "GC=F": "GOLD" },
     ),
-    stevens_renderer.stevens_pass_conditions_renderer(
-        {"Fetch Pass Conditions": (hours * 1)},
-        "www.wsdot.com",
-        ["/traffic/rssfeeds/stevens/Default.aspx"],
-    ),
     seattletimes_rss_renderer.seattletimes_rss_renderer(
         {"Fetch News": (hours * 4), "Shuffle News": (always)},
         "www.seattletimes.com",