projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use new LoggingContext stuff.
[kiosk.git]
/
google_news_rss_renderer.py
diff --git
a/google_news_rss_renderer.py
b/google_news_rss_renderer.py
index 2faeff2d01a0a0361180a07d8e17496aaaad6be1..c7442707b623aa97d6493306b1b675996accb5d0 100644
(file)
--- a/
google_news_rss_renderer.py
+++ b/
google_news_rss_renderer.py
@@
-1,12
+1,17
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
-from bs4 import BeautifulSoup # type: ignore
+import logging
import re
from typing import Dict, List, Optional
import xml
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
import generic_news_rss_renderer
+logger = logging.getLogger(__file__)
+
class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
def __init__(
class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_renderer):
def __init__(
@@
-16,13
+21,9
@@
class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_render
feed_uris: List[str],
page_title: str,
) -> None:
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
)
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"
def get_headlines_page_prefix(self) -> str:
return "google-news"
@@
-32,15
+33,15
@@
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")
def find_description(self, item: xml.etree.ElementTree.Element) -> str:
descr = item.findtext("description")
- source = item.findtext("source")
if descr is not None:
if descr is not None:
+ source = item.findtext("source")
if source is not None:
if source is not None:
- descr = descr + f" (
source
)"
+ descr = descr + f" (
{source}
)"
else:
descr = ""
return descr
else:
descr = ""
return descr
- def munge_description_internal(self, descr: str) -> str:
+ def munge_description_internal(self, descr: str
, item: ET.Element
) -> str:
if len(descr) > 450:
descr = descr[:450]
descr = re.sub(r"\<[^\>]*$", "", descr)
if len(descr) > 450:
descr = descr[:450]
descr = re.sub(r"\<[^\>]*$", "", descr)
@@
-48,12
+49,12
@@
class google_news_rss_renderer(generic_news_rss_renderer.generic_news_rss_render
descr += "</A></LI></UL></OL></P>"
return descr
descr += "</A></LI></UL></OL></P>"
return descr
- def munge_description(self, description: str) -> str:
+ def munge_description(self, description: str
, item: ET.Element
) -> str:
soup = BeautifulSoup(description, features="lxml")
for a in soup.findAll("a"):
del a["href"]
descr = str(soup)
soup = BeautifulSoup(description, features="lxml")
for a in soup.findAll("a"):
del a["href"]
descr = str(soup)
- return self.munge_description_internal(descr)
+ return self.munge_description_internal(descr
, item
)
def find_image(self, item: xml.etree.ElementTree.Element) -> Optional[str]:
return None
def find_image(self, item: xml.etree.ElementTree.Element) -> Optional[str]:
return None