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

diff --git a/bellevue_reporter_rss_renderer.py b/bellevue_reporter_rss_renderer.py
index fec70e00d83cb62022f526c90515e35ad8b44165..862e17136956d98a2121c9728cdc76434b79745d 100644 (file)
--- a/bellevue_reporter_rss_renderer.py
+++ b/bellevue_reporter_rss_renderer.py
@@ -64,6 +64,7 @@ class bellevue_reporter_rss_renderer(gnrss.generic_news_rss_renderer):
                 "marketplace" in description
                 or "national-marketplace" in description
                 or re.search("[Ww]eed", title) is not None
+                or re.search("[Tt]estosterone", title) is not None
                 or re.search("[Cc]annabis", title) is not None
                 or re.search("[Cc]annabis", description) is not None
                 or "THC" in title

diff --git a/generic_news_rss_renderer.py b/generic_news_rss_renderer.py
index 2acf1938d33fe3ec554019256bc27a0083c6a2da..f1261cb59e171cfa2a8348487839cb7edc2dd124 100644 (file)
--- a/generic_news_rss_renderer.py
+++ b/generic_news_rss_renderer.py
@@ -236,8 +236,10 @@ class generic_news_rss_renderer(renderer.abstaining_renderer):
 
             if response.status != 200:
                 logger.error(
-                    f"Unexpected status {response.status} while fetching {url}; giving up."
+                    f"Unexpected status {response.status} while fetching {url}: {response.reason}; giving up."
                 )
+                print(dir(response))
+                print(response.headers)
                 return False
 
             raw = response.read()

diff --git a/invw_rss_renderer.py b/invw_rss_renderer.py
new file mode 100644 (file)
index 0000000..ea610f3
--- /dev/null
+++ b/invw_rss_renderer.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+import xml
+from typing import Dict, List, Optional
+
+import generic_news_rss_renderer as gnrssr
+
+
+class invw_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 = True
+
+    def debug_prefix(self) -> str:
+        return f"invw({self.page_title})"
+
+    def get_headlines_page_prefix(self) -> str:
+        return f"invw-{self.page_title}"
+
+    def get_details_page_prefix(self) -> str:
+        return f"invw-details-{self.page_title}"
+
+    def find_image(self, item: xml.etree.ElementTree.Element) -> Optional[str]:
+        return None
+
+    def should_use_https(self) -> bool:
+        return True
+
+    def item_is_interesting_for_headlines(
+        self, title: str, description: str, item: xml.etree.ElementTree.Element
+    ) -> bool:
+        return title != "InvestigateWest"
+
+    def item_is_interesting_for_article(
+        self, title: str, description: str, item: xml.etree.ElementTree.Element
+    ) -> bool:
+        return title != "InvestigateWest" and description != "InvestigateWest"
+
+# Test
+#x = invw_rss_renderer(
+#    {"Fetch News" : 1,
+#     "Shuffle News" : 1},
+#    "www.invw.org",
+#    [ "/feed/" ],
+#    "Test" )
+#if x.fetch_news() == 0:
+#    print("Error fetching news, no items fetched.")
+#x.shuffle_news()

diff --git a/kiosk.py b/kiosk.py
index 14dae5721adbf8c5da5a0ece5af965de095deaa8..fe9e174262537b5267541d52483a8f3d746152ab 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -725,7 +725,13 @@ def main() -> None:
                         "The hotword detector thread seems to have died; restarting it and hoping for the best."
                     )
                 keyword_paths = [pvporcupine.KEYWORD_PATHS[x] for x in ["bumblebee"]]
-                sensitivities = [0.7] * len(keyword_paths)
+
+                # Sensitivity is the parameter that enables trading
+                # miss rate for the false alarm rate. It is a floating
+                # point number within [0, 1]. A higher sensitivity
+                # reduces the miss rate at the cost of increased false
+                # alarm rate.
+                sensitivities = [0.4] * len(keyword_paths)
                 listener = listen.HotwordListener(
                     command_queue,
                     keyword_paths,

diff --git a/kiosk_secrets.py b/kiosk_secrets.py
index e43c354336a14dc1e3e723a683982188452a767a..c3d9771c9cc98ce2024a6ace2c551e856717ec88 100644 (file)
--- a/kiosk_secrets.py
+++ b/kiosk_secrets.py
@@ -21,4 +21,3 @@ twitter_access_token_secret = "<your twitter app access token secret>"
 
 # wakeword detection
 pvporcupine_key = "<your pvporcupine_key>"
-

diff --git a/listen.py b/listen.py
index 62012b543be21f8dca95f054dd52264e04b62e0c..e431a0b199fa67073d315b42e8413187555ef1f1 100755 (executable)
--- a/listen.py
+++ b/listen.py
@@ -11,7 +11,6 @@ from pyutils import logging_utils
 
 import kiosk_secrets as secrets
 
-
 logger = logging.getLogger(__name__)
 
 

diff --git a/pages/wenatchee-cams_3_none.html b/pages/wenatchee-cams_3_none.html
index 19ba8264e6b1bdbd299a91180bdc82bac18931a2..5f47da8acf1a70a6b3f93c2f9efdf534cbf1e316 100644 (file)
--- a/pages/wenatchee-cams_3_none.html
+++ b/pages/wenatchee-cams_3_none.html
@@ -28,7 +28,7 @@
      border="0"
      height="392"
      width="512"
-     src="http://10.0.0.233:8080/rirF9tp7MdjNFl2atzoEvU2BFDyWin/jpeg/WHyDnbh4sv/c3XfOJfFDn/s.jpg"
+     src="http://10.0.0.233:8080/rirF9tp7MdjNFl2atzoEvU2BFDyWin/jpeg/WHyDnbh4sv/GhZkOhWlTi/s.jpg" \>
 <br />
 </td>
 <td>

diff --git a/renderer_catalog.py b/renderer_catalog.py
index f14cb9cc0d447372ab62780d295812b79c39c2fd..a36395476eaac5adac152fe5e1fef64530daf37d 100644 (file)
--- a/renderer_catalog.py
+++ b/renderer_catalog.py
@@ -24,6 +24,7 @@ import recipe_renderer_and_trigger
 import urbanist_renderer
 import weather_renderer
 import wsj_rss_renderer
+import invw_rss_renderer
 
 
 seconds = 1
@@ -96,6 +97,12 @@ __registry = [
         ["/rss/RSSMarketsMain.xml", "/rss/WSJcomUSBusiness.xml"],
         "WSJBusiness",
     ),
+    invw_rss_renderer.invw_rss_renderer(
+        {"Fetch News": (hours * 4), "Shuffle News": (always)},
+        "www.invw.org",
+        ["/feed/"],
+        "invw.org",
+    ),
     stevens_renderer.stevens_renderer({"Unused": (minutes * 30)}),
     google_news_rss_renderer.google_news_rss_renderer(
         {"Fetch News": (minutes * 30), "Shuffle News": (always)},