Move per-thread processing stuff into Thread

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index f2a81d2247b898f7450f2e9d037e976db3821762..ed7813b36a8a0977e55744ba1fe9558ef92aeae8 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -4,42 +4,35 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation, version 3.
 
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation, version 3.
 

-
-from bs4 import BeautifulSoup
-

 from args import spec_from_commandline_args
 from args import spec_from_commandline_args

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

 from spec import Spec
 
 
 from spec import Spec
 
 

-def parse(content: bytes) -> BeautifulSoup:
-    return BeautifulSoup(content, 'html.parser')
-
-

 def process(spec: Spec) -> None:
 def process(spec: Spec) -> None:

-    spec.texout.write(b'''\\documentclass{article}
-\\usepackage{graphicx}
-\\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}\n')
-    html = parse(spec.htmlfilter(spec.fetcher.fetch(spec.url)))
-    first = True
-    for r in chunkDOMs(html):
-        if first:
-            first = False
-        else:
-            # h/t https://tex.stackexchange.com/questions/309856
-            spec.texout.write(b'''
-\\wrapstuffclear\\vspace{-.5\\ht\\strutbox}\\noindent\\hrulefill
-
-''')
-        spec.domfilter(r)
-        chunk = makeChunk(r, spec.images)
-        spec.texout.write(spec.layout.renderChunk(chunk))
+    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(spec).emit()

     spec.texout.write(b'\\end{document}\n')
 
 
     spec.texout.write(b'\\end{document}\n')