Rename html → dom

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 4e7cdf6840b8bbd7fb6a227db538bc9db9cde915..ade0b885d42addb973f415599798bd2e153ac961 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -7,9 +7,10 @@
 from typing import Any, Iterable
 
 from bs4 import BeautifulSoup
 from typing import Any, Iterable
 
 from bs4 import BeautifulSoup

+from bs4.element import Tag

 
 from args import spec_from_commandline_args
 
 from args import spec_from_commandline_args

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

 from spec import Spec
 
 
 from spec import Spec
 
 


@@ -21,29 +22,51 @@ def ilen(it: Iterable[Any]) -> int:
     return sum(1 for _ in it)
 
 
     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:
 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}\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)
     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))
+    thread = Thread(dom)
+    spec.log('Counting chunks...\r')
+    num_chunks = ilen(thread.chunkDOMs())
+    title = get_title(dom) 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')