Add a Google News RSS-based renderer. Minor improvements to all

[kiosk.git] / renderer_catalog.py

diff --git a/renderer_catalog.py b/renderer_catalog.py
index c789aaa2b6f6e2c10c500eaa04654d8ad9f85201..738b4d15d77c6153ccc44e652f4472803e496f9e 100644 (file)
--- a/renderer_catalog.py
+++ b/renderer_catalog.py
@@ -3,6 +3,7 @@ import constants
 import cnn_rss_renderer
 import gdata_oauth
 import gcal_renderer
+import google_news_rss_renderer
 import gkeep_renderer
 import health_renderer
 import local_photos_mirror_renderer
@@ -25,8 +26,8 @@ oauth = gdata_oauth.OAuth(secrets.google_client_id,
 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))
+    print(('Go to %s and enter the code "%s" (no quotes, case-sensitive)' % (
+        oauth.verification_url, user_code)))
     oauth.get_new_token()
 
 seconds = 1
@@ -45,7 +46,7 @@ __registry = [
 #                     {"Poll" : (hours * 1)}),
                  myq_renderer.garage_door_renderer(
                      {"Poll MyQ" : (minutes * 5),
-                      "Update Page" : (minutes * 5)}),
+                      "Update Page" : (always)}),
                  bellevue_reporter_rss_renderer.bellevue_reporter_rss_renderer(
                      {"Fetch News" : (hours * 1),
                       "Shuffle News" : (always)},
@@ -58,15 +59,6 @@ __registry = [
                      "mynorthwest.com",
                      [ "/feed/" ],
                      "MyNorthwest News" ),
-                 cnn_rss_renderer.cnn_rss_renderer(
-                     {"Fetch News" : (hours * 1),
-                      "Shuffle News" : (always)},
-                     "rss.cnn.com",
-                     [ "/rss/money_latest.rss",
-                       "/rss/money_mostpopular.rss",
-                       "/rss/money_news_economy.rss",
-                       "/rss/money_news_companies.rss" ],
-                     "CNNMoney" ),
                  cnn_rss_renderer.cnn_rss_renderer(
                      {"Fetch News" : (hours * 1),
                       "Shuffle News" : (always)},
@@ -95,6 +87,12 @@ __registry = [
                      [ "/rss/RSSMarketsMain.xml",
                        "/rss/WSJcomUSBusiness.xml"],
                      "WSJBusiness" ),
+                 google_news_rss_renderer.google_news_rss_renderer(
+                     {"Fetch News" : (minutes * 30),
+                      "Shuffle News" : (always)},
+                      "news.google.com",
+                      [ "/rss?hl=en-US&gl=US&ceid=US:en" ],
+                     "Google News" ),
                  health_renderer.periodic_health_renderer(
                      {"Update Perioidic Job Health" : (seconds * 45)}),
                  stock_renderer.stock_quote_renderer(