Latest version of image support for toot

.gitignore

@@ -14,3 +14,4 @@
 /toot-*.tar.gz
 debug.log
 /pyrightconfig.json
+/venv/

requirements.txt

@@ -2,3 +2,4 @@ requests>=2.13,<3.0
 beautifulsoup4>=4.5.0,<5.0
 wcwidth>=0.1.7
 urwid>=2.0.0,<3.0
+pillow>=8.4.0

setup.py

@@ -38,6 +38,7 @@
         "beautifulsoup4>=4.5.0,<5.0",
         "wcwidth>=0.1.7",
         "urwid>=2.0.0,<3.0",
+        "pillow>=8.4.0"
     ],
     entry_points={
         'console_scripts': [

toot/console.py

@@ -265,6 +265,10 @@ def editor(value):
                 "default": False,
                 "help": "Show relative datetimes in status list.",
             }),
+            (["--256"], {
+                "help": "Use 256 colors for image display, rather than truecolor",
+                "action": "store_true"
+            })
         ],
         require_auth=True,
     ),

toot/tui/app.py

@@ -1,5 +1,7 @@
 import logging
 import urwid
+import requests
+import sys
 
 from concurrent.futures import ThreadPoolExecutor
 
@@ -15,8 +17,13 @@
 from .poll import Poll
 from .timeline import Timeline
 from .utils import parse_content_links, show_media
+from .palette import convert_to_xterm_256_palette
+from PIL import Image
+from term_image.widget import UrwidImageJanitor, UrwidImageScreen
+
 
 logger = logging.getLogger(__name__)
+truecolor = '--256' not in sys.argv  # TBD make this a config option
 
 urwid.set_encoding('UTF-8')
 
@@ -78,9 +85,11 @@ def create(cls, app, user, args):
         """Factory method, sets up TUI and an event loop."""
 
         tui = cls(app, user, args)
+        image_capable_tui = UrwidImageJanitor(tui)
         loop = urwid.MainLoop(
-            tui,
+            image_capable_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,
         )
@@ -225,6 +234,7 @@ def _clear(*args):
         urwid.connect_signal(timeline, "links", _links)
         urwid.connect_signal(timeline, "zoom", _zoom)
         urwid.connect_signal(timeline, "translate", self.async_translate)
+        urwid.connect_signal(timeline, "load-image", self.async_load_image)
         urwid.connect_signal(timeline, "clear-screen", _clear)
 
     def build_timeline(self, name, statuses, local):
@@ -286,8 +296,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):
@@ -639,6 +649,32 @@ def _done(loop):
 
         return self.run_in_thread(_delete, done_callback=_done)
 
+    def async_load_image(self, self2, 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")
+                if not truecolor:
+                    img = convert_to_xterm_256_palette(img)
+                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)
+
     # --- Overlay handling -----------------------------------------------------
 
     default_overlay_options = dict(

toot/tui/overlays.py

@@ -1,13 +1,18 @@
 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 .utils import highlight_hashtags, highlight_keys  # , resize_image
 from .widgets import Button, EditBox, SelectableText
 from toot import api
+# from .palette import convert_to_xterm_256_palette
+from PIL import Image
+from term_image.image import AutoImage
+from term_image.widget import UrwidImage
 
 
 class StatusSource(urwid.Padding):
@@ -219,6 +224,38 @@ def setup_listbox(self):
         walker = urwid.SimpleListWalker(actions)
         super().__init__(walker)
 
+    def account_header(self, account):
+        if account['avatar_static'] and not account["avatar_static"].endswith("missing.png"):
+            img = Image.open(requests.get(account['avatar_static'], stream=True).raw)
+
+            if img.format == 'PNG' and img.mode != 'RGBA':
+                img = img.convert("RGBA")
+#                if not truecolor:
+#                    img = convert_to_xterm_256_palette(img)
+#            img = resize_image(None, 200, img)
+            aimg = urwid.BoxAdapter(UrwidImage(AutoImage(img)), 10)
+        else:
+            aimg = urwid.BoxAdapter(urwid.SolidFill(" "), 10)
+
+        if account['header_static'] and not account["header_static"].endswith("missing.png"):
+            img = Image.open(requests.get(account['header_static'], stream=True).raw)
+
+            if img.format == 'PNG' and img.mode != 'RGBA':
+                img = img.convert("RGBA")
+#                if not truecolor:
+#                    img = convert_to_xterm_256_palette(img)
+#            img = resize_image(None, 200, img)
+            himg = (urwid.BoxAdapter(UrwidImage(AutoImage(img)), 10))
+        else:
+            himg = urwid.BoxAdapter(urwid.SolidFill(" "), 10)
+
+        atxt = urwid.Pile([urwid.Divider(), (urwid.Text(("green", account['display_name']))),
+                (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)
@@ -237,17 +274,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}")])