Show name of thread being processed

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index bda6d1941c84eb1b578461439dfa87ada971469a..012bd069aca5a3066b443640bc66904d796e44ee 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -5,7 +5,6 @@
 # Free Software Foundation, version 3.
 
 
 # Free Software Foundation, version 3.
 
 

-from abc import ABC, abstractmethod

 from dataclasses import dataclass
 import itertools
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 from dataclasses import dataclass
 import itertools
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse


@@ -111,43 +110,27 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
                  content)
 
 
                  content)
 
 

-def renderIcon(icon_path: str | None, image_size: float) -> bytes | None:
-    if icon_path is None:
-        return None
-    return br'\includegraphics[width=%fmm,height=%fmm,keepaspectratio]{%s}' % (
-        image_size, image_size, icon_path.encode('UTF-8'))
+def renderChunk(texifier: Texifier, chunk: Chunk) -> bytes:
+    return b''.join([
+        br'\glowhead{',
+        br'\glowicon{%s}' % chunk.icon.encode('UTF-8') if chunk.icon else b'',
+        b'}{',
+        texifier.texify(chunk.character) if chunk.character else b'',
+        b'}{',
+        texifier.texify(chunk.screen_name) if chunk.screen_name else b'',
+        b'}{',
+        texifier.texify(chunk.author) if chunk.author else b'',
+        b'}',
+        texifier.texify(chunk.content)])

 
 
 
 

-class Layout(ABC):
+ContentOnlyLayout = br'''
+\newcommand{\glowhead}[4]{}
+'''

 
 

-    @abstractmethod
-    def renderChunk(self, chunk: Chunk) -> bytes:
-        raise NotImplementedError()

 
 

-
-class ContentOnlyLayout(Layout):
-
-    def __init__(self, texifier: Texifier) -> None:
-        self._texifier = texifier
-
-    def renderChunk(self, chunk: Chunk) -> bytes:
-        return self._texifier.texify(chunk.content) + b'\n'
-
-
-class BelowIconLayout(Layout):
-
-    def __init__(self, texifier: Texifier, image_size: float) -> None:
-        self._texifier = texifier
-        self._image_size = image_size
-
-    def renderChunk(self, chunk: Chunk) -> bytes:
-        icon = renderIcon(chunk.icon, self._image_size)
-        meta = [icon] if icon else []
-        meta += [self._texifier.texify(x)
-                 for x in [chunk.character, chunk.screen_name, chunk.author]
-                 if x is not None]
-
-        return br'''\wrapstuffclear
+BelowIconLayout = br'''
+\newcommand{\glowhead}[4]{\wrapstuffclear

 \begin{wrapstuff}[l]
 \fbox{
 \begin{varwidth}{0.5\textwidth}
 \begin{wrapstuff}[l]
 \fbox{
 \begin{varwidth}{0.5\textwidth}


@@ -159,7 +142,10 @@ class BelowIconLayout(Layout):
   }\\*}
   \vspace{-1em}
 \begin{center}
   }\\*}
   \vspace{-1em}
 \begin{center}

-%s
+#1\ifnotempty
+{#1}{\\*}#2\ifnotempty
+{#2}{\\*}#3\ifnotempty
+{#3}{\\*}#4

 \end{center}
 \end{varwidth}
 }
 \end{center}
 \end{varwidth}
 }


@@ -167,42 +153,25 @@ class BelowIconLayout(Layout):
 
 \strut
 
 
 \strut
 

-\noindent %s
-''' % (
-            br'\\*'.join(meta),
-            self._texifier.texify(chunk.content))
-
+\noindent}'''

 
 

-class BesideIconLayout(Layout):

 
 

-    def __init__(self, texifier: Texifier, image_size: float) -> None:
-        self._texifier = texifier
-        self._image_size = image_size
+# Why is \textwidth not the width of the text?
+# Why is the width of the text .765\textwidth?
+BesideIconLayout = br'''
+\newcommand{\glowhead}[4]{

 
 

-    def renderChunk(self, chunk: Chunk) -> bytes:
-        icon = renderIcon(chunk.icon, self._image_size)
-        meta = [
-            chunk.character,
-            chunk.screen_name,
-            chunk.author,
-        ]
+\strut

 
 

-        # Why is \textwidth not the width of the text?
-        # Why is the width of the text .765\textwidth?
-        return br'''\noindent\fbox{
-%s
+\noindent\fbox{
+#1

 \parbox[b]{.765\textwidth}{
 \begin{center}
 \parbox[b]{.765\textwidth}{
 \begin{center}

-%s
+#2\ifnotempty
+{#2}{\\*}#3\ifnotempty
+{#3}{\\*}#4

 \end{center}
 }
 }\\*
 \vspace{-0.75em}\\*
 \end{center}
 }
 }\\*
 \vspace{-0.75em}\\*

-\noindent %s
-
-\strut
-
-''' % (
-            icon if icon else b'',
-            br'\\*'.join(self._texifier.texify(x) for x in meta if x is not None),
-            self._texifier.texify(chunk.content))
+\noindent}'''