Move get_title() to Thread

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 1350784584dc20e3c4cee60c3bfd71321883ffe1..cf500571604c9590920d36090e8484f4ba8ad498 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -7,10 +7,9 @@
 from typing import Any, Iterable
 
 from bs4 import BeautifulSoup
-from bs4.element import Tag
 
 from args import spec_from_commandline_args
-from glowfic import chunkDOMs, flatURL, makeChunk, renderChunk
+from glowfic import flatURL, makeChunk, renderChunk, Thread
 from spec import Spec
 
 
@@ -22,13 +21,6 @@ def ilen(it: Iterable[Any]) -> int:
     return sum(1 for _ in it)
 
 
-def get_title(dom: BeautifulSoup) -> str | None:
-    span = dom.findChild("span", id="post-title")
-    if not isinstance(span, Tag):
-        return None
-    return span.text
-
-
 def process(spec: Spec) -> None:
     spec.texout.write(br'''\documentclass{article}
 \usepackage{booktabs}
@@ -57,10 +49,11 @@ def process(spec: Spec) -> None:
     html = spec.fetcher.fetch(url)
     spec.log('Parsing HTML...\r')
     dom = parse(spec.htmlfilter(html))
+    thread = Thread(dom)
     spec.log('Counting chunks...\r')
-    num_chunks = ilen(chunkDOMs(dom))
-    title = get_title(dom) or "chunk"
-    for i, r in enumerate(chunkDOMs(dom)):
+    num_chunks = ilen(thread.chunkDOMs())
+    title = thread.title() or "chunk"
+    for i, r in enumerate(thread.chunkDOMs()):
         percent = 100.0 * i / num_chunks
         spec.log(f'Processing {title} {i} of {num_chunks} ({percent:.1f}%)\r')
         spec.domfilter(r)