Move per-thread processing stuff into Thread

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index d545f6184514f0386068871a247b6a30fe1aad18..ed7813b36a8a0977e55744ba1fe9558ef92aeae8 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -4,17 +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 args import spec_from_commandline_args
 from args import spec_from_commandline_args

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

 from spec import Spec
 
 
 from spec import Spec
 
 

-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}


@@ -38,17 +32,7 @@ def process(spec: Spec) -> None:
   \detokenize{#1}\relax\else #2\fi}
 %s
 ''' % (spec.icon_size, spec.layout))
   \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
-        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)))
-    spec.log('')
+    Thread(spec).emit()

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