Latest version of image support for toot

.github/workflows/test.yml

@@ -4,12 +4,10 @@ on: [push, pull_request]
 
 jobs:
   test:
-    # Older Ubuntu required for testing on Python 3.6 which is not available in
-    # later versions. Remove once support for 3.6 is dropped.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -13,4 +13,5 @@
 /toot-*.tar.gz
 debug.log
 /pyrightconfig.json
+/venv/
 /book

requirements.txt

@@ -2,4 +2,5 @@ requests>=2.13,<3.0
 beautifulsoup4>=4.5.0,<5.0
 wcwidth>=0.1.7
 urwid>=2.0.0,<3.0
-
+pillow>=9.5.0
+term-image==0.6.1

setup.py

@@ -32,12 +32,14 @@
         'Programming Language :: Python :: 3',
     ],
     packages=['toot', 'toot.tui', 'toot.utils'],
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=[
         "requests>=2.13,<3.0",
         "beautifulsoup4>=4.5.0,<5.0",
         "wcwidth>=0.1.7",
         "urwid>=2.0.0,<3.0",
+        "pillow>=9.5.0",
+        "term-image==0.6.1",
     ],
     entry_points={
         'console_scripts': [

toot/tui/app.py

@@ -1,5 +1,6 @@
 import logging
 import urwid
+import requests
 
 from concurrent.futures import ThreadPoolExecutor
 
@@ -16,6 +17,9 @@
 from .poll import Poll
 from .timeline import Timeline
 from .utils import parse_content_links, show_media, copy_to_clipboard
+from PIL import Image
+from term_image.widget import UrwidImageScreen
+
 
 logger = logging.getLogger(__name__)
 
@@ -82,6 +86,7 @@ def create(cls, app, user, args):
         loop = urwid.MainLoop(
             tui,
             palette=PALETTE,
+            screen=UrwidImageScreen(),  # like urwid.raw_display.Screen, but clears Kitty + iTerm2 images on startup
             event_loop=urwid.AsyncioEventLoop(),
             unhandled_input=tui.unhandled_input,
         )
@@ -236,8 +241,8 @@ def _close(*args):
 
         self.connect_default_timeline_signals(timeline)
         urwid.connect_signal(timeline, "close", _close)
-
         self.body = timeline
+        timeline.refresh_status_details()
         self.refresh_footer(timeline)
 
     def async_load_timeline(self, is_initial, timeline_name=None, local=None):
@@ -636,6 +641,30 @@ def _done(loop):
 
         return self.run_in_thread(_delete, done_callback=_done)
 
+    def async_load_image(self, timeline, status, path, placeholder_index):
+        def _load():
+            # don't bother loading images for statuses we are not viewing now
+            if timeline.get_focused_status().id != status.id:
+                return
+
+            if not hasattr(timeline, "images"):
+                timeline.images = dict()
+            try:
+                img = Image.open(requests.get(path, stream=True).raw)
+                if img.format == 'PNG' and img.mode != 'RGBA':
+                    img = img.convert("RGBA")
+                timeline.images[str(hash(path))] = img
+            except:  # noqa E722
+                pass  # ignore errors; if we can't load an image, just show blank
+
+        def _done(loop):
+            # don't bother loading images for statuses we are not viewing now
+            if timeline.get_focused_status().id != status.id:
+                return
+            timeline.update_status_image(status, path, placeholder_index)
+
+        return self.run_in_thread(_load, done_callback=_done)
+
     def copy_status(self, status):
         # TODO: copy a better version of status content
         # including URLs

toot/tui/overlays.py

@@ -1,13 +1,17 @@
 import json
+import requests
 import traceback
 import urwid
 import webbrowser
 
 from toot import __version__
 from toot.utils import format_content
-from .utils import highlight_hashtags, highlight_keys
-from .widgets import Button, EditBox, SelectableText
+from .utils import highlight_hashtags, highlight_keys, add_corners
+from .widgets import Button, EditBox, SelectableText, EmojiText
 from toot import api
+from PIL import Image
+from term_image.image import AutoImage
+from term_image.widget import UrwidImage
 
 
 class StatusSource(urwid.Padding):
@@ -249,6 +253,45 @@ def setup_listbox(self):
         walker = urwid.SimpleListWalker(actions)
         super().__init__(walker)
 
+    def account_header(self, account):
+        if account['avatar'] and not account["avatar"].endswith("missing.png"):
+            img = Image.open(requests.get(account['avatar'], stream=True).raw)
+
+            if img.format == 'PNG' and img.mode != 'RGBA':
+                img = img.convert("RGBA")
+            aimg = urwid.BoxAdapter(
+                UrwidImage(
+                    AutoImage(
+                        add_corners(img, 10)), upscale=True),
+                10)
+        else:
+            aimg = urwid.BoxAdapter(urwid.SolidFill(" "), 10)
+
+        if account['header'] and not account["header"].endswith("missing.png"):
+            img = Image.open(requests.get(account['header'], stream=True).raw)
+
+            if img.format == 'PNG' and img.mode != 'RGBA':
+                img = img.convert("RGBA")
+            himg = (urwid.BoxAdapter(
+                    UrwidImage(
+                        AutoImage(
+                            add_corners(img, 10)
+                        ), upscale=True),
+                    10)
+                    )
+        else:
+            himg = urwid.BoxAdapter(urwid.SolidFill(" "), 10)
+
+        atxt = urwid.Pile([urwid.Divider(),
+                        urwid.AttrMap(
+                            EmojiText(account["display_name"], account["emojis"]),
+                            "green"),
+                (urwid.Text(("yellow", "@" + self.account['acct'])))])
+        columns = urwid.Columns([aimg, ("weight", 9999, himg)], dividechars=2, min_width=20)
+
+        header = urwid.Pile([columns, urwid.Divider(), atxt])
+        return header
+
     def generate_contents(self, account, relationship=None, last_action=None):
         if self.last_action and not self.last_action.startswith("Confirm"):
             yield Button(f"Confirm {self.last_action}", on_press=take_action, user_data=self)
@@ -270,17 +313,14 @@ def generate_contents(self, account, relationship=None, last_action=None):
 
         yield urwid.Divider("─")
         yield urwid.Divider()
-        yield urwid.Text([('green', f"@{account['acct']}"), f"  {account['display_name']}"])
+
+        yield self.account_header(account)
 
         if account["note"]:
             yield urwid.Divider()
             for line in format_content(account["note"]):
                 yield urwid.Text(highlight_hashtags(line, followed_tags=set()))
-
-        yield urwid.Divider()
-        yield urwid.Text(["ID: ", ("green", f"{account['id']}")])
-        yield urwid.Text(["Since: ", ("green", f"{account['created_at'][:10]}")])
-        yield urwid.Divider()
+            yield urwid.Divider()
 
         if account["bot"]:
             yield urwid.Text([("green", "Bot \N{robot face}")])