Fix cameras, improve weather, delegate health renderer to a helper,

[kiosk.git] / google_news_rss_renderer.py

diff --git a/google_news_rss_renderer.py b/google_news_rss_renderer.py
index 8653339bb435629abf3a211c422e19eecd011ae5..c7442707b623aa97d6493306b1b675996accb5d0 100644 (file)
--- a/google_news_rss_renderer.py
+++ b/google_news_rss_renderer.py
@@ -1,13 +1,17 @@
 #!/usr/bin/env python3
 
-from bs4 import BeautifulSoup  # type: ignore
+import logging
 import re
 from typing import Dict, List, Optional
 import xml
 import xml.etree.ElementTree as ET
 
+from bs4 import BeautifulSoup  # type: ignore
+
 import generic_news_rss_renderer
 
+logger = logging.getLogger(__file__)
+
 
 class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
     def __init__(
@@ -17,13 +21,9 @@ class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_render
         feed_uris: List[str],
         page_title: str,
     ) -> None:
-        super(google_news_rss_renderer, self).__init__(
+        super().__init__(
             name_to_timeout_dict, feed_site, feed_uris, page_title
         )
-        self.debug = True
-
-    def debug_prefix(self) -> str:
-        return "google-news"
 
     def get_headlines_page_prefix(self) -> str:
         return "google-news"
@@ -33,10 +33,10 @@ class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_render
 
     def find_description(self, item: xml.etree.ElementTree.Element) -> str:
         descr = item.findtext("description")
-        source = item.findtext("source")
         if descr is not None:
+            source = item.findtext("source")
             if source is not None:
-                descr = descr + f" (source)"
+                descr = descr + f" ({source})"
         else:
             descr = ""
         return descr