next_thread should be an absolute URL

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index e192646b431c89b1ea2b32fdd72025f7056f905f..9d863c887e2992cd8bbdbc4d1a8a1ddffce65155 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -5,10 +5,9 @@
 # Free Software Foundation, version 3.
 
 
 # Free Software Foundation, version 3.
 
 

-from abc import ABC, abstractmethod

 from dataclasses import dataclass
 import itertools
 from dataclasses import dataclass
 import itertools

-from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
+from urllib.parse import parse_qsl, urlencode, urljoin, urlparse, urlunparse

 
 from typing import Iterable
 
 
 from typing import Iterable
 


@@ -16,6 +15,7 @@ from bs4 import BeautifulSoup
 from bs4.element import Tag
 
 from images import ImageStore
 from bs4.element import Tag
 
 from images import ImageStore

+from spec import Spec

 from texify import Texifier
 
 
 from texify import Texifier
 
 


@@ -55,20 +55,48 @@ class Chunk:
 #  * Humans in the community tend to use "posts" to mean chunks.
 
 
 #  * Humans in the community tend to use "posts" to mean chunks.
 
 

-def chunkDOMs(html: BeautifulSoup) -> Iterable[Tag]:
-    def text() -> Tag:
-        body = html.body
-        assert body
-        text = body.find_next("div", class_="post-post")
-        assert isinstance(text, Tag)
-        return text
+class Thread:

 
 

-    def the_replies() -> Iterable[Tag]:
-        rs = html.find_all("div", class_="post-reply")
-        assert all(isinstance(r, Tag) for r in rs)
-        return rs
+    def __init__(self, spec: Spec) -> None:
+        def find_next_thread(dom: BeautifulSoup) -> str | None:
+            for c in dom.findChildren('div', class_='post-navheader'):
+                for a in c.findChildren('a'):
+                    if 'Next Post' in a.text and 'href' in a.attrs and isinstance(
+                            a.attrs['href'], str):
+                        return urljoin(spec.url, a.attrs['href'])
+            return None
+
+        spec.log('Fetching HTML...\r')
+        html = spec.fetcher.fetch(spec.url)
+        flat_html = spec.fetcher.fetch(flatURL(spec.url))
+        spec.log('Parsing HTML...\r')
+        self._next_thread = find_next_thread(
+            BeautifulSoup(spec.htmlfilter(html), 'html.parser'))
+        self._dom = BeautifulSoup(spec.htmlfilter(flat_html), 'html.parser')
+
+    def title(self) -> str | None:
+        span = self._dom.findChild("span", id="post-title")
+        if not isinstance(span, Tag):
+            return None
+        return span.text.strip()
+
+    def next_thread(self) -> str | None:
+        return self._next_thread
+
+    def chunkDOMs(self) -> Iterable[Tag]:
+        def text() -> Tag:
+            body = self._dom.body
+            assert body
+            text = body.find_next("div", class_="post-post")
+            assert isinstance(text, Tag)
+            return text

 
 

-    return itertools.chain([text()], the_replies())
+        def the_replies() -> Iterable[Tag]:
+            rs = self._dom.find_all("div", class_="post-reply")
+            assert all(isinstance(r, Tag) for r in rs)
+            return rs
+
+        return itertools.chain([text()], the_replies())

 
 
 def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
 
 
 def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:


@@ -89,106 +117,90 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk:
         assert tag is None or isinstance(tag, Tag)
         return tag
 
         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
+        stripHREF(tag)
+        return tag
+

     content = chunk_dom.findChild('div', class_='post-content')
     assert isinstance(content, Tag)
 
     return Chunk(getIcon(),
     content = chunk_dom.findChild('div', class_='post-content')
     assert isinstance(content, Tag)
 
     return Chunk(getIcon(),

-                 getByClass('post-character'),
-                 getByClass('post-screenname'),
-                 getByClass('post-author'),
+                 getMeta('post-character'),
+                 getMeta('post-screenname'),
+                 getMeta('post-author'),

                  content)
 
 
                  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
-
-
-class Layout(ABC):
-
-    @abstractmethod
-    def renderChunk(self, chunk: Chunk) -> bytes:
-        raise NotImplementedError()
-
-
-class ContentOnlyLayout(Layout):
-
-    def __init__(self, texifier: Texifier) -> None:
-        self._texifier = texifier
+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)])
+
+
+ContentOnlyLayout = br'''
+\newcommand{\glowhead}[4]{}
+'''
+
+
+BelowIconLayout = br'''
+\newcommand{\glowhead}[4]{\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}
+#1\ifnotempty
+{#1}{\\*}#2\ifnotempty
+{#2}{\\*}#3\ifnotempty
+{#3}{\\*}#4
+\end{center}
+\end{varwidth}
+}
+\end{wrapstuff}

 
 

-    def renderChunk(self, chunk: Chunk) -> bytes:
-        return self._texifier.texify(chunk.content) + b'\n'
+\strut

 
 

+\noindent}'''

 
 

-class BelowIconLayout(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 = [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]
+\strut

 
 

-        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}
-%s
-\\end{center}
-\\end{varwidth}
-}
-\\end{wrapstuff}
-
-\\strut
-
-\\noindent %s
-''' % (
-            b'\\\\*'.join(meta),
-            self._texifier.texify(chunk.content))
-
-
-class BesideIconLayout(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 = [
-            chunk.character,
-            chunk.screen_name,
-            chunk.author,
-        ]
-
-        # Why is \textwidth not the width of the text?
-        # Why is the width of the text .765\textwidth?
-        return b'''\\noindent\\fbox{
-%s
-\\parbox[b]{.765\\textwidth}{
-\\begin{center}
-%s
-\\end{center}
+\noindent\fbox{
+#1
+\parbox[b]{.765\textwidth}{
+\begin{center}
+#2\ifnotempty
+{#2}{\\*}#3\ifnotempty
+{#3}{\\*}#4
+\end{center}

 }
 }

-}\\\\*
-\\vspace{-0.75em}\\\\*
-\\noindent %s
-
-\\strut
-
-''' % (
-            icon.encode('UTF-8') if icon else b'',
-            b'\\\\*'.join(self._texifier.texify(x) for x in meta if x is not None),
-            self._texifier.texify(chunk.content))
+}\\*
+\vspace{-0.75em}\\*
+\noindent}'''