Move per-thread processing stuff into Thread

[paperdoorknob] / glowfic.py

diff --git a/glowfic.py b/glowfic.py
index 8029b5d704f1bffab897426c34a16a8b44fe30fb..ef71eef019e8005b4c2bbf8a34ab49b0362f3e85 100644 (file)
--- a/glowfic.py
+++ b/glowfic.py
@@ -7,9 +7,9 @@
 
 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 Any, Iterable

 
 from bs4 import BeautifulSoup
 from bs4.element import Tag
 
 from bs4 import BeautifulSoup
 from bs4.element import Tag


@@ -19,6 +19,10 @@ from spec import Spec
 from texify import Texifier
 
 
 from texify import Texifier
 
 

+def ilen(it: Iterable[Any]) -> int:
+    return sum(1 for _ in it)
+
+

 def _removeViewFromURL(url: str) -> str:
     u = urlparse(url)
     old_qs = parse_qsl(u.query)
 def _removeViewFromURL(url: str) -> str:
     u = urlparse(url)
     old_qs = parse_qsl(u.query)


@@ -57,15 +61,23 @@ class Chunk:
 
 class Thread:
 
 
 class Thread:
 

-    def __init__(self, thing: BeautifulSoup | Spec) -> None:
-        if isinstance(thing, Spec):
-            spec = thing
-            spec.log('Fetching HTML...\r')
-            html = spec.fetcher.fetch(flatURL(spec.url))
-            spec.log('Parsing HTML...\r')
-            self._dom = BeautifulSoup(spec.htmlfilter(html), 'html.parser')
-        else:
-            self._dom = thing
+    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')
+        self._spec = spec

 
     def title(self) -> str | None:
         span = self._dom.findChild("span", id="post-title")
 
     def title(self) -> str | None:
         span = self._dom.findChild("span", id="post-title")


@@ -73,6 +85,9 @@ class Thread:
             return None
         return span.text.strip()
 
             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
     def chunkDOMs(self) -> Iterable[Tag]:
         def text() -> Tag:
             body = self._dom.body


@@ -88,6 +103,20 @@ class Thread:
 
         return itertools.chain([text()], the_replies())
 
 
         return itertools.chain([text()], the_replies())
 

+    def emit(self) -> None:
+        self._spec.log('Counting chunks...\r')
+        num_chunks = ilen(self.chunkDOMs())
+        title = self.title() or "chunk"
+        for i, r in enumerate(self.chunkDOMs()):
+            percent = 100.0 * i / num_chunks
+            self._spec.log(
+                f'Processing {title} {i} of {num_chunks} ({percent:.1f}%)\r')
+            self._spec.domfilter(r)
+            chunk = makeChunk(r, self._spec.images)
+            self._spec.texout.write(
+                self._spec.texfilter(renderChunk(self._spec.texifier, chunk)))
+        self._spec.log('')
+

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