Optionally have Thread.__init__ fetch the HTML

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 86b8766e659601b6d05a1c2dcd28e6c7f2fbb868..d545f6184514f0386068871a247b6a30fe1aad18 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -6,17 +6,11 @@
 
 from typing import Any, Iterable
 
-from bs4 import BeautifulSoup
-
 from args import spec_from_commandline_args
-from glowfic import chunkDOMs, flatURL, makeChunk, renderChunk
+from glowfic import makeChunk, renderChunk, Thread
 from spec import Spec
 
 
-def parse(content: bytes) -> BeautifulSoup:
-    return BeautifulSoup(content, 'html.parser')
-
-
 def ilen(it: Iterable[Any]) -> int:
     return sum(1 for _ in it)
 
@@ -44,16 +38,13 @@ def process(spec: Spec) -> None:
   \detokenize{#1}\relax\else #2\fi}
 %s
 ''' % (spec.icon_size, spec.layout))
-    url = flatURL(spec.url)
-    spec.log('Fetching HTML...\r')
-    html = spec.fetcher.fetch(url)
-    spec.log('Parsing HTML...\r')
-    dom = parse(spec.htmlfilter(html))
+    thread = Thread(spec)
     spec.log('Counting chunks...\r')
-    num_chunks = ilen(chunkDOMs(dom))
-    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 chunk {i} of {num_chunks} ({percent:.1f}%)\r')
+        spec.log(f'Processing {title} {i} of {num_chunks} ({percent:.1f}%)\r')
         spec.domfilter(r)
         chunk = makeChunk(r, spec.images)
         spec.texout.write(spec.texfilter(renderChunk(spec.texifier, chunk)))