Move per-thread processing stuff into Thread

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 81831360e462a6a9af1b366f3384e566e0adb412..ed7813b36a8a0977e55744ba1fe9558ef92aeae8 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -4,23 +4,11 @@
 # 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 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 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:
     spec.texout.write(br'''\documentclass{article}
 \usepackage{booktabs}
 def process(spec: Spec) -> None:
     spec.texout.write(br'''\documentclass{article}
 \usepackage{booktabs}


@@ -37,21 +25,14 @@ def process(spec: Spec) -> None:
     spec.texout.write(br'''\begin{document}
 \newcommand{\href}[2]{#2\footnote{\detokenize{#1}}}
 \def\glowiconsize{%fmm}
     spec.texout.write(br'''\begin{document}
 \newcommand{\href}[2]{#2\footnote{\detokenize{#1}}}
 \def\glowiconsize{%fmm}

-''' % spec.icon_size)
-    url = flatURL(spec.url)
-    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))
-    for i, r in enumerate(chunkDOMs(dom)):
-        percent = 100.0 * i / num_chunks
-        spec.log(f'Processing chunk {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.log('')
+\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')