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

[kiosk.git] / mynorthwest_rss_renderer.py

diff --git a/mynorthwest_rss_renderer.py b/mynorthwest_rss_renderer.py
index fbe73bbd84ef3095c258f1c596509df9f7ef97c7..08430281a069b9112dae80ce3f828aca2a73ca17 100644 (file)
--- a/mynorthwest_rss_renderer.py
+++ b/mynorthwest_rss_renderer.py
@@ -1,43 +1,52 @@
-import generic_news_rss_renderer
+#!/usr/bin/env python3
 
+from typing import Dict, List, Optional
+import xml
 
-class mynorthwest_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
-    def __init__(self, name_to_timeout_dict, feed_site, feed_uris, page_title):
-        super(mynorthwest_rss_renderer, self).__init__(
+import generic_news_rss_renderer as gnrssr
+
+
+class mynorthwest_rss_renderer(gnrssr.generic_news_rss_renderer):
+    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
         )
-        self.debug = 1
+        self.debug = True
 
-    def debug_prefix(self):
-        return "mynorthwest(%s)" % (self.page_title)
+    def debug_prefix(self) -> str:
+        return f"mynorthwest({self.page_title})"
 
-    def get_headlines_page_prefix(self):
-        return "mynorthwest-%s" % (self.page_title)
+    def get_headlines_page_prefix(self) -> str:
+        return f"mynorthwest-{self.page_title}"
 
-    def get_details_page_prefix(self):
-        return "mynorthwest-details-%s" % (self.page_title)
+    def get_details_page_prefix(self) -> str:
+        return f"mynorthwest-details-{self.page_title}"
 
-    def find_image(self, item):
+    def find_image(self, item: xml.etree.ElementTree.Element) -> Optional[str]:
         image = item.findtext("media:content")
         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 True
 
-    def item_is_interesting_for_headlines(self, title, description, item):
-        if self.is_item_older_than_n_days(item, 10):
-            self.debug_print("%s: is too old!" % title)
-            return False
-        return True
+    def item_is_interesting_for_headlines(
+        self, title: str, description: str, item: xml.etree.ElementTree.Element
+    ) -> bool:
+        return not self.is_item_older_than_n_days(item, 10)
 
-    def item_is_interesting_for_article(self, title, description, item):
-        if self.is_item_older_than_n_days(item, 10):
-            self.debug_print("%s: is too old!" % title)
-            return False
-        return True
+    def item_is_interesting_for_article(
+        self, title: str, description: str, item: xml.etree.ElementTree.Element
+    ) -> bool:
+        return not self.is_item_older_than_n_days(item, 10)
 
 
 # Test