X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/1452f8d33eb6ffe6812698768f1e6bb975d9c4cf..9afdb32a9385204c13018198a136637ad599df47:/glowfic.py?ds=inline

diff --git a/glowfic.py b/glowfic.py
index 5730508..4c108b8 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
@@ -74,34 +74,49 @@ def chunkDOMs(html: BeautifulSoup) -> Iterable[Tag]:
 def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
 
     def getIcon() -> str | None:
-        icon_div = chunk_dom.find_next('div', class_='post-icon')
+        icon_div = chunk_dom.findChild('div', class_='post-icon')
         if icon_div is None:
             return None
-        icon_img = icon_div.find_next('img')
+        assert isinstance(icon_div, Tag)
+        icon_img = icon_div.findChild('img')
         if icon_img is None:
             return None
         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:
+    def getByClass(css_class: str) -> Tag | None:
+        tag = chunk_dom.findChild('div', class_=css_class)
+        assert tag is None or isinstance(tag, Tag)
+        return tag
+
+    def stripHREF(tag: Tag) -> None:
+        for c in tag.findChildren("a"):
+            if "href" in c.attrs:
+                del c.attrs["href"]
+
+    def getMeta(css_class: str) -> Tag | None:
+        tag = getByClass(css_class)
+        if tag is None:
             return None
-        return div.text.strip()
+        stripHREF(tag)
+        return tag
 
-    content = chunk_dom.find_next('div', class_='post-content')
+    content = chunk_dom.findChild('div', class_='post-content')
     assert isinstance(content, Tag)
 
     return Chunk(getIcon(),
-                 getTextByClass('post-character'),
-                 getTextByClass('post-screenname'),
-                 getTextByClass('post-author'),
+                 getMeta('post-character'),
+                 getMeta('post-screenname'),
+                 getMeta('post-author'),
                  content)
 
 
-def renderIcon(icon_path: str | None, image_size: float) -> str | None:
-    params = f'width={image_size}mm,height={image_size}mm,keepaspectratio'
-    return f'\\includegraphics[{params}]{{{icon_path}}}' if icon_path else None
+def renderIcon(icon_path: str | None) -> bytes | None:
+    if icon_path is None:
+        return None
+    return (
+        br'\includegraphics[width=\glowiconsize,height=\glowiconsize,keepaspectratio]{%s}' %
+        icon_path.encode('UTF-8'))
 
 
 class Layout(ABC):
@@ -122,52 +137,49 @@ class ContentOnlyLayout(Layout):
 
 class BelowIconLayout(Layout):
 
-    def __init__(self, texifier: Texifier, image_size: float) -> None:
+    def __init__(self, texifier: Texifier) -> None:
         self._texifier = texifier
-        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,
-        ]
-
-        return b'''\\wrapstuffclear
-\\begin{wrapstuff}[l]
-\\fbox{
-\\begin{varwidth}{0.5\\textwidth}
-  \\smash{\\parbox[t][0pt]{0pt}{
-    \\setlength{\\fboxrule}{0.2pt}
-    \\setlength{\\fboxsep}{0pt}
-    \\vspace{-3.4pt}
-    \\fbox{\\hspace{107mm}}
-  }\\\\*}
-  \\vspace{-1em}
-\\begin{center}
+        icon = renderIcon(chunk.icon)
+        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
+\begin{wrapstuff}[l]
+\fbox{
+\begin{varwidth}{0.5\textwidth}
+  \smash{\parbox[t][0pt]{0pt}{
+    \setlength{\fboxrule}{0.2pt}
+    \setlength{\fboxsep}{0pt}
+    \vspace{-3.4pt}
+    \fbox{\hspace{107mm}}
+  }\\*}
+  \vspace{-1em}
+\begin{center}
 %s
-\\end{center}
-\\end{varwidth}
+\end{center}
+\end{varwidth}
 }
-\\end{wrapstuff}
+\end{wrapstuff}
 
-\\strut
+\strut
 
-\\noindent %s
+\noindent %s
 ''' % (
-            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
+            br'\\*'.join(meta),
             self._texifier.texify(chunk.content))
 
 
 class BesideIconLayout(Layout):
 
-    def __init__(self, texifier: Texifier, image_size: float) -> None:
+    def __init__(self, texifier: Texifier) -> None:
         self._texifier = texifier
-        self._image_size = image_size
 
     def renderChunk(self, chunk: Chunk) -> bytes:
-        icon = renderIcon(chunk.icon, self._image_size)
+        icon = renderIcon(chunk.icon)
         meta = [
             chunk.character,
             chunk.screen_name,
@@ -176,20 +188,20 @@ class BesideIconLayout(Layout):
 
         # Why is \textwidth not the width of the text?
         # Why is the width of the text .765\textwidth?
-        return b'''\\noindent\\fbox{
+        return br'''\noindent\fbox{
 %s
-\\parbox[b]{.765\\textwidth}{
-\\begin{center}
+\parbox[b]{.765\textwidth}{
+\begin{center}
 %s
-\\end{center}
+\end{center}
 }
-}\\\\*
-\\vspace{-0.75em}\\\\*
-\\noindent %s
+}\\*
+\vspace{-0.75em}\\*
+\noindent %s
 
-\\strut
+\strut
 
 ''' % (
-            icon.encode('UTF-8') if icon else b'',
-            b'\\\\*'.join(x.encode('UTF-8') for x in meta if x is not None),
+            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))