Show name of thread being processed

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 26a60fbc0524f5daf46fbc8f92e131c011e0fef1..1350784584dc20e3c4cee60c3bfd71321883ffe1 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -4,14 +4,13 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation, version 3.
 
-from sys import stderr
-
 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
+from glowfic import chunkDOMs, flatURL, makeChunk, renderChunk
 from spec import Spec
 
 
@@ -23,32 +22,51 @@ 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(b'''\\documentclass{article}
-\\usepackage{booktabs}
-\\usepackage{graphicx}
-\\usepackage{longtable}
-\\usepackage{soul}
-\\usepackage{varwidth}
-\\usepackage{wrapstuff}
+    spec.texout.write(br'''\documentclass{article}
+\usepackage{booktabs}
+\usepackage{graphicx}
+\usepackage{longtable}
+\usepackage{soul}
+\usepackage{varwidth}
+\usepackage{wrapstuff}
 ''')
     if spec.geometry is not None:
-        spec.texout.write(b'\\usepackage[' +
+        spec.texout.write(br'\usepackage[' +
                           spec.geometry.encode('UTF-8') +
                           b']{geometry}\n')
-    spec.texout.write(b'\\begin{document}\n')
+    spec.texout.write(br'''\begin{document}
+\newcommand{\href}[2]{#2\footnote{\detokenize{#1}}}
+\def\glowiconsize{%fmm}
+\newcommand{\glowicon}[1]{\includegraphics[
+  width=\glowiconsize,height=\glowiconsize,keepaspectratio
+]{#1}}
+\newcommand{\ifnotempty}[2]{\expandafter\ifx\expandafter\relax
+  \detokenize{#1}\relax\else #2\fi}
+%s
+''' % (spec.icon_size, spec.layout))
     url = flatURL(spec.url)
-    html = parse(spec.htmlfilter(spec.fetcher.fetch(url)))
-    num_chunks = ilen(chunkDOMs(html))
-    for i, r in enumerate(chunkDOMs(html)):
+    spec.log('Fetching HTML...\r')
+    html = spec.fetcher.fetch(url)
+    spec.log('Parsing HTML...\r')
+    dom = parse(spec.htmlfilter(html))
+    spec.log('Counting chunks...\r')
+    num_chunks = ilen(chunkDOMs(dom))
+    title = get_title(dom) or "chunk"
+    for i, r in enumerate(chunkDOMs(dom)):
         percent = 100.0 * i / num_chunks
-        print(
-            f'Processing chunk {i} of {num_chunks} ({percent:.1f}%)',
-            end='\r',
-            file=stderr)
+        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(spec.layout.renderChunk(chunk)))
+        spec.texout.write(spec.texfilter(renderChunk(spec.texifier, chunk)))
+    spec.log('')
     spec.texout.write(b'\\end{document}\n')