Image handling

fedicurses.py

@@ -1,3 +1,4 @@
+#! /usr/bin/python3
 import curses
 from html.parser import HTMLParser
 from mastodon import Mastodon
@@ -6,7 +7,8 @@ def initColours():
                        # 0: White on black
     curses.init_pair(1, 4, 0) # 1: Blue on black
     curses.init_pair(2, 1, 0) # 2: Red on black
-    curses.init_pair(3, 6, 0) # 2: Cyan on black
+    curses.init_pair(3, 6, 0) # 3: Cyan on black
+    curses.init_pair(4, 2, 0) # 4: Green on black
 
 def newLine(ncwin, lines=1):
     cy, cx = ncwin.getyx()
@@ -56,12 +58,13 @@ def typeset(text, win, attr, colour):
 
 def printPost(win, post, parser):
     # win.addstr(post["account"]["acct"], curses.A_BOLD)
-    typeset(post["account"]["acct"], win, curses.A_BOLD, 0)
+    typeset("@{}".format(post["account"]["acct"]), win, curses.A_BOLD, 0)
     if (post["reblog"] is not None):
         # win.addstr(" boosted ")
         typeset(" boosted ", win, 0, 0)
         # win.addstr(post["reblog"]["account"]["acct"], curses.A_BOLD)
-        typeset(post["reblog"]["account"]["acct"], win, curses.A_BOLD, 0)
+        typeset("@{}".format(post["reblog"]["account"]["acct"]), win, 
+                curses.A_BOLD, 0)
     # win.addstr(":")
     typeset(":", win, 0, 0)
     newLine(win)
@@ -73,6 +76,23 @@ def printPost(win, post, parser):
     if parser.openp:
         newLine(win)
 
+    for att in post["media_attachments"]:
+        # typeset("[IMG: {}, <{}>]".format(att["alt"], att["src"]))
+        typeset("[IMG: {}]".format(att["description"] if
+                                         att["description"] is not None
+                                         else "(Alt text missing)"),
+               win, 0, 4)
+        newLine(win)
+
+    if (post["reblog"] is not None):
+        for att in post["reblog"]["media_attachments"]:
+            # typeset("[IMG: {}, <{}>]".format(att["alt"], att["src"]))
+            typeset("[IMG: {}]".format(att["description"] if
+                                             att["description"] is not None
+                                             else "(Alt text missing)"),
+                   win, 0, 4)
+            newLine(win)
+
     botstring = "{} @ {} UTC".format(post["visibility"],
                                      post["created_at"
                                          ].strftime(
@@ -94,7 +114,9 @@ def printAtLevel(stdscr, col1, col2, posts, parser, level):
     newLine(col1)
     printPost(col1, posts[(level + 1) % len(posts)], parser)
     try:
-        col2.addstr(str(posts[level]))
+        col2.addstr(str(posts[level]["content"]))
+        col2.addstr(str(posts[level]["media_attachments"]))
+        col2.addstr(str(posts[level].keys()))
     except curses.error:
         pass
     stdscr.noutrefresh()
@@ -130,6 +152,10 @@ class PostParser(HTMLParser):
         elif tag == 'code':
             self.colstack.append(self.colour)
             self.colour = 3
+        elif tag == 'img':
+            typeset("[IMG: {}, <{}>]".format(att["alt"], att["src"]), self.win,
+                   0, 4)
+
 
     def handle_endtag(self, tag):
         if tag == 'p':