solderpunk
/
AV-98
9
21
Fork 15
Code Issues 4 Pull Requests 4 Releases Wiki Activity

avoid crash with badly formatted images

This commit is contained in:
Lionel Dricot 2022-02-13 10:59:10 +01:00
parent 74bbf76814
commit ed5298b67e
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
offpunk.py
View File

@ -461,11 +461,11 @@ class FolderRenderer(AbstractRenderer):
else: else:
my_lists.append(l) my_lists.append(l)
if len(my_lists) > 0: if len(my_lists) > 0:
body+= "\n## Bookmarks Lists\n" body+= "\n## Bookmarks Lists (updated during sync)\n"
for l in my_lists: for l in my_lists:
body += write_list(l) body += write_list(l)
if len(subscriptions) > 0: if len(subscriptions) > 0:
body +="\n## Subscriptions\n" body +="\n## Subscriptions (new links in those are added to tour)\n"
for l in subscriptions: for l in subscriptions:
body += write_list(l) body += write_list(l)
if len(system_lists) > 0: if len(system_lists) > 0:
@ -703,16 +703,20 @@ class HtmlRenderer(AbstractRenderer):
ansi_img = "" ansi_img = ""
if _RENDER_IMAGE and mode != "quick" and src: if _RENDER_IMAGE and mode != "quick" and src:
abs_url = urllib.parse.urljoin(self.url, src) abs_url = urllib.parse.urljoin(self.url, src)
g = GeminiItem(abs_url) try:
if g.is_cache_valid(): g = GeminiItem(abs_url)
img = g.get_cache_path() if g.is_cache_valid():
renderer = ImageRenderer(img,abs_url) img = g.get_cache_path()
# Image are 40px wide except if terminal is smaller renderer = ImageRenderer(img,abs_url)
if width > 40: # Image are 40px wide except if terminal is smaller
size = 40 if width > 40:
else: size = 40
size = width else:
ansi_img = renderer.get_body(width=size) size = width
ansi_img = renderer.get_body(width=size)
except Exception as err:
#we sometimes encounter really bad formatted files or URL
ansi_img += "[BAD IMG] %s"%src
alt = element.get("alt") alt = element.get("alt")
if alt: if alt:
alt = sanitize_string(alt) alt = sanitize_string(alt)