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

diff --git a/cnn_rss_renderer.py b/cnn_rss_renderer.py
index c1ae7fd..873d9c8 100644
--- a/cnn_rss_renderer.py
+++ b/cnn_rss_renderer.py
@@ -1,47 +1,57 @@
+#!/usr/bin/env python3
+
 import generic_news_rss_renderer
 import re
+from typing import Dict, List, Optional
+import xml
 
 
 class cnn_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
-    def __init__(self, name_to_timeout_dict, feed_site, feed_uris, page_title):
-        super(cnn_rss_renderer, self).__init__(
-            name_to_timeout_dict, feed_site, feed_uris, page_title
-        )
-        self.debug = 1
+    def __init__(
+        self,
+        name_to_timeout_dict: Dict[str, int],
+        feed_site: str,
+        feed_uris: List[str],
+        page_title: str,
+    ):
+        super().__init__(name_to_timeout_dict, feed_site, feed_uris, page_title)
 
-    def debug_prefix(self):
-        return "cnn(%s)" % (self.page_title)
+    def get_headlines_page_prefix(self) -> str:
+        return f"cnn-{self.page_title}"
 
-    def get_headlines_page_prefix(self):
-        return "cnn-%s" % (self.page_title)
+    def get_details_page_prefix(self) -> str:
+        return f"cnn-details-{self.page_title}"
 
-    def get_details_page_prefix(self):
-        return "cnn-details-%s" % (self.page_title)
-
-    def munge_description(self, description):
+    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
 
-    def find_image(self, item):
+    def find_image(self, item: xml.etree.ElementTree.Element) -> Optional[str]:
         image = item.findtext("media:thumbnail")
         if image is not None:
             image_url = image.get("url")
             return image_url
         return None
 
-    def should_use_https(self):
+    def should_use_https(self) -> bool:
         return False
 
-    def item_is_interesting_for_headlines(self, title, description, item):
-        if self.is_item_older_than_n_days(item, 14):
-            self.debug_print("%s: is too old!" % title)
+    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=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):
+    def item_is_interesting_for_article(
+        self, title, description, item: xml.etree.ElementTree.Element
+    ):
         if self.is_item_older_than_n_days(item, 7):
-            self.debug_print("%s: is too old!" % title)
             return False
         return (
             re.search(r"[Cc][Nn][Nn][A-Za-z]*\.com", title) is None
@@ -51,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()