X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/69169c2c71234aa0bc60e15b331369263db0e4b8..37c47bc273c9c46d35be45ee7866ca5ca01f3159:/glowfic.py

diff --git a/glowfic.py b/glowfic.py
index 5730508..a700995 100644
--- a/glowfic.py
+++ b/glowfic.py
@@ -39,9 +39,9 @@ def flatURL(url: str) -> str:
 @dataclass(frozen=True)
 class Chunk:
     icon: str | None
-    character: str | None
-    screen_name: str | None
-    author: str | None
+    character: Tag | None
+    screen_name: Tag | None
+    author: Tag | None
     content: Tag
 
 # We avoid the name "post" because the Glowfic community uses the term
@@ -83,19 +83,18 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
         assert isinstance(icon_img, Tag)
         return image_store.get_image(icon_img.attrs['src'])
 
-    def getTextByClass(css_class: str) -> str | None:
-        div = chunk_dom.find_next('div', class_=css_class)
-        if div is None:
-            return None
-        return div.text.strip()
+    def getByClass(css_class: str) -> Tag | None:
+        tag = chunk_dom.find_next('div', class_=css_class)
+        assert tag is None or isinstance(tag, Tag)
+        return tag
 
     content = chunk_dom.find_next('div', class_='post-content')
     assert isinstance(content, Tag)
 
     return Chunk(getIcon(),
-                 getTextByClass('post-character'),
-                 getTextByClass('post-screenname'),
-                 getTextByClass('post-author'),
+                 getByClass('post-character'),
+                 getByClass('post-screenname'),
+                 getByClass('post-author'),
                  content)
 
 
@@ -127,12 +126,11 @@ class BelowIconLayout(Layout):
         self._image_size = image_size
 
     def renderChunk(self, chunk: Chunk) -> bytes:
-        meta = [
-            renderIcon(chunk.icon, self._image_size),
-            chunk.character,
-            chunk.screen_name,
-            chunk.author,
-        ]
+        icon = renderIcon(chunk.icon, self._image_size)
+        meta = [icon.encode('UTF-8')] if icon else []
+        meta += [self._texifier.texify(x)
+                 for x in [chunk.character, chunk.screen_name, chunk.author]
+                 if x is not None]
 
         return b'''\\wrapstuffclear
 \\begin{wrapstuff}[l]
@@ -156,7 +154,7 @@ class BelowIconLayout(Layout):
 
 \\noindent %s
 ''' % (
-            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
+            b'\\\\*'.join(meta),
             self._texifier.texify(chunk.content))
 
 
@@ -191,5 +189,5 @@ class BesideIconLayout(Layout):
 
 ''' % (
             icon.encode('UTF-8') if icon else b'',
-            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
+            b'\\\\*'.join(self._texifier.texify(x) for x in meta if x is not None),
             self._texifier.texify(chunk.content))