X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=cnn_rss_renderer.py;h=873d9c8bb8fbb2c839e3dff080dee8529dd59322;hb=5ea88ab72e175e2d4f57ae8645ca6f825549a7a9;hp=3e15c98c40d7e455980fe535c8b8e982d3dba3c8;hpb=5c39d86ebc075ccb7be98b1dfab8040b72ff9134;p=kiosk.git

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index 3e15c98..873d9c8 100644
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -14,13 +14,7 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
         feed_uris: List[str],
         page_title: str,
     ):
-        super(cnn_rss_renderer, self).__init__(
-            name_to_timeout_dict, feed_site, feed_uris, page_title
-        )
-        self.debug = True
-
-    def debug_prefix(self) -> str:
-        return f"cnn({self.page_title})"
+        super().__init__(name_to_timeout_dict, feed_site, feed_uris, page_title)
 
     def get_headlines_page_prefix(self) -> str:
         return f"cnn-{self.page_title}"
@@ -28,7 +22,9 @@ class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
     def get_details_page_prefix(self) -> str:
         return f"cnn-details-{self.page_title}"
 
-    def munge_description(self, description: str, item: xml.etree.ElementTree.Element) -> str:
+    def munge_description(
+        self, description: str, item: xml.etree.ElementTree.Element
+    ) -> str:
         description = re.sub("[Rr]ead full story for latest details.", "", description)
         description = re.sub("<[^>]+>", "", description)
         return description
@@ -46,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):
+        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
@@ -63,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()