Merge branch 'master' of ssh://git.house:/usr/local/git/base/kiosk

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index 2628bd58975f0bb9b4f2614961b28377a68daf74..873d9c8bb8fbb2c839e3dff080dee8529dd59322 100644 (file)
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -42,9 +42,11 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
     def item_is_interesting_for_headlines(
         self, title: str, description: str, item: xml.etree.ElementTree.Element
     ) -> bool:
-        if self.is_item_older_than_n_days(item, 14, default=False):
+        if self.is_item_older_than_n_days(item, 14, default=True):
             return False
-        return re.search(r"[Cc][Nn][Nn][A-Za-z]*\.com", title) is None
+        if re.search(r"[Cc][Nn][Nn][A-Za-z]*\.com", title) is None:
+            return True
+        return False
 
     def item_is_interesting_for_article(
         self, title, description, item: xml.etree.ElementTree.Element
@@ -59,14 +61,20 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
 
 # Test
 # x = cnn_rss_renderer(
-#    {"Fetch News" : 1,
-#     "Shuffle News" : 1},
+#    {
+#        "Fetch News" : 1,
+#        "Shuffle News" : 1
+#    },
 #    "rss.cnn.com",
-#    [ "/rss/cnn_topstories.rss",
-#      "/rss/money_latest.rss",
-#     "/rss/cnn_tech.rss",
+#    [
+#        "/rss/money_technology.rss",
+#        "/rss/cnn_tech.rss",
+#        "/rss/cnn_topstories.rss",
+#        "/rss/cnn_world.rss",
+#        "/rss/cnn_us.rss",
 #    ],
-#    "Test" )
+#    "Test"
+# )
 # if x.fetch_news() == 0:
 #    print("Error fetching news, no items fetched.")
 # x.shuffle_news()

diff --git a/renderer_catalog.py b/renderer_catalog.py
index 1f38b4f677251b0a2219b57c2482b24a1a39ff6e..b5fdebd2eee1d1c0efcbd32aa44fd7a68f824487 100644 (file)
--- a/renderer_catalog.py
+++ b/renderer_catalog.py
@@ -18,7 +18,7 @@ import stevens_renderer
 import kiosk_secrets as secrets
 import recipe_renderer_and_trigger
 import stock_renderer
-import twitter_renderer
+#import twitter_renderer
 import urbanist_renderer
 import weather_renderer
 import wsj_rss_renderer
@@ -159,9 +159,9 @@ __registry = [
     reddit_renderer.lifeprotips_reddit_renderer(
         {"Scrape": (hours * 6), "Shuffle": (always)}
     ),
-    twitter_renderer.twitter_renderer(
-        {"Fetch Tweets": (minutes * 15), "Shuffle Tweets": (always)}
-    ),
+#    twitter_renderer.twitter_renderer(
+#        {"Fetch Tweets": (minutes * 15), "Shuffle Tweets": (always)}
+#    ),
     recipe_renderer_and_trigger.RecipeRenderer(
         "/home/pi/.recipe_url", {"Maybe Render Recipe Page": (always)}
     ),