Move get_title() to Thread

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 86b8766e659601b6d05a1c2dcd28e6c7f2fbb868..cf500571604c9590920d36090e8484f4ba8ad498 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -9,7 +9,7 @@ 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 flatURL, makeChunk, renderChunk, Thread
 from spec import Spec
 
 
@@ -49,11 +49,13 @@ 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))
-    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)))