aniani/toot
1
0
Fork 0
mirror of https://github.com/ihabunek/toot.git synced 2024-06-30 06:35:24 +00:00
Code

Merge pull request #485 from ihabunek/indexed

Browse Source 
Added support for indexed color image rendering; fixes #483
This commit is contained in:
Ivan Habunek 2024-06-08 09:32:09 +02:00 committed by GitHub
commit 6ea13db2a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyproject.toml
View File

@ -32,7 +32,7 @@ dependencies = [
# Required to display images in the TUI # Required to display images in the TUI
images = [ images = [
"pillow>=9.5.0", "pillow>=9.5.0",
"term-image==0.7.0", "term-image>=0.7.2",
] ]
# Required to display rich text in the TUI # Required to display rich text in the TUI

8
toot/tui/images.py
View File

@ -22,7 +22,7 @@ try:
def can_render_pixels(image_format): def can_render_pixels(image_format):
return image_format in _IMAGE_PIXEL_FORMATS return image_format in _IMAGE_PIXEL_FORMATS
def get_base_image(image, image_format) -> BaseImage: def get_base_image(image, image_format, colors) -> BaseImage:
# we don't autodetect kitty, iterm; we choose based on option switches # we don't autodetect kitty, iterm; we choose based on option switches
global _ImageCls global _ImageCls
@ -36,6 +36,8 @@ try:
else BlockImage else BlockImage
) )
_ImageCls.forced_support = True _ImageCls.forced_support = True
if colors == 256 and not can_render_pixels(image_format):
_ImageCls.set_render_method("INDEXED")
return _ImageCls(image) return _ImageCls(image)
@ -79,7 +81,7 @@ try:
except Exception: except Exception:
return None return None
def graphics_widget(img, image_format="block", corner_radius=0) -> urwid.Widget: def graphics_widget(img, image_format="block", corner_radius=0, colors=16777216) -> urwid.Widget:
if not img: if not img:
return urwid.SolidFill(fill_char=" ") return urwid.SolidFill(fill_char=" ")
@ -88,7 +90,7 @@ try:
else: else:
render_img = img render_img = img
return UrwidImage(get_base_image(render_img, image_format), '<', upscale=True) return UrwidImage(get_base_image(render_img, image_format, colors), '<', upscale=True)
# "<" means left-justify the image # "<" means left-justify the image
except ImportError: except ImportError:

6
toot/tui/overlays.py
View File

@ -262,7 +262,8 @@ class Account(urwid.ListBox):
if image_support_enabled() and account['avatar'] and not account["avatar"].endswith("missing.png"): if image_support_enabled() and account['avatar'] and not account["avatar"].endswith("missing.png"):
img = load_image(account['avatar']) img = load_image(account['avatar'])
aimg = urwid.BoxAdapter( aimg = urwid.BoxAdapter(
graphics_widget(img, image_format=self.options.image_format, corner_radius=10), 10) graphics_widget(img, image_format=self.options.image_format, corner_radius=10,
colors=self.options.colors), 10)
else: else:
aimg = urwid.BoxAdapter(urwid.SolidFill(" "), 10) aimg = urwid.BoxAdapter(urwid.SolidFill(" "), 10)
@ -270,7 +271,8 @@ class Account(urwid.ListBox):
img = load_image(account['header']) img = load_image(account['header'])
himg = (urwid.BoxAdapter( himg = (urwid.BoxAdapter(
graphics_widget(img, image_format=self.options.image_format, corner_radius=10), 10)) graphics_widget(img, image_format=self.options.image_format, corner_radius=10,
colors=self.options.colors), 10))
else: else:
himg = urwid.BoxAdapter(urwid.SolidFill(" "), 10) himg = urwid.BoxAdapter(urwid.SolidFill(" "), 10)

6
toot/tui/timeline.py
View File

@ -339,7 +339,8 @@ class Timeline(urwid.Columns):
if img: if img:
try: try:
status.placeholders[placeholder_index]._set_original_widget( status.placeholders[placeholder_index]._set_original_widget(
graphics_widget(img, image_format=self.tui.options.image_format, corner_radius=10)) graphics_widget(img, image_format=self.tui.options.image_format, corner_radius=10,
colors=self.tui.options.colors))
except IndexError: except IndexError:
# ignore IndexErrors. # ignore IndexErrors.
@ -408,7 +409,8 @@ class StatusDetails(urwid.Pile):
pass pass
if img: if img:
return (urwid.BoxAdapter( return (urwid.BoxAdapter(
graphics_widget(img, image_format=self.timeline.tui.options.image_format, corner_radius=10), rows)) graphics_widget(img, image_format=self.timeline.tui.options.image_format, corner_radius=10,
colors=self.timeline.tui.options.colors), rows))
else: else:
placeholder = urwid.BoxAdapter(urwid.SolidFill(fill_char=" "), rows) placeholder = urwid.BoxAdapter(urwid.SolidFill(fill_char=" "), rows)
self.status.placeholders.append(placeholder) self.status.placeholders.append(placeholder)