Always have Thread.__init__ fetch the HTML

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 05b068f6c6993015df844e7a6b7b3a3f40dc7387..d545f6184514f0386068871a247b6a30fe1aad18 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -6,46 +6,48 @@
 
 from typing import Any, Iterable
 
 
 from typing import Any, Iterable
 

-from bs4 import BeautifulSoup
-

 from args import spec_from_commandline_args
 from args import spec_from_commandline_args

-from glowfic import chunkDOMs, flatURL, makeChunk
+from glowfic import makeChunk, renderChunk, Thread

 from spec import Spec
 
 
 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)
 
 
 def process(spec: Spec) -> None:
 def ilen(it: Iterable[Any]) -> int:
     return sum(1 for _ in it)
 
 
 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:
 ''')
     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.geometry.encode('UTF-8') +
                           b']{geometry}\n')

-    spec.texout.write(b'''\\begin{document}
-\\newcommand{\\href}[2]{#2\\footnote{#1}}
-''')
-    url = flatURL(spec.url)
-    dom = parse(spec.htmlfilter(spec.fetcher.fetch(url)))
-    num_chunks = ilen(chunkDOMs(dom))
-    for i, r in enumerate(chunkDOMs(dom)):
+    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))
+    thread = Thread(spec)
+    spec.log('Counting chunks...\r')
+    num_chunks = ilen(thread.chunkDOMs())
+    title = thread.title() or "chunk"
+    for i, r in enumerate(thread.chunkDOMs()):

         percent = 100.0 * i / num_chunks
         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.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')
 
     spec.log('')
     spec.texout.write(b'\\end{document}\n')