Strip all  

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index f83c9f869651a0a35fd86fdf11fdb004e5e5ae4d..34223e4c35eb7636370c1032764de6455c075933 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -5,43 +5,19 @@
 # Free Software Foundation, version 3.
 
 
-from argparse import ArgumentParser
 import itertools
-import os.path
-import subprocess
 
-from typing import IO, Iterable
+from typing import Iterable
 
 from bs4 import BeautifulSoup
 from bs4.element import Tag
-from xdg_base_dirs import xdg_cache_home
 
-from fetch import CachingFetcher, Fetcher
+from args import spec_from_commandline_args
+from spec import Spec
 
 
-def command_line_parser() -> ArgumentParser:
-    parser = ArgumentParser(prog='paperdoorknob', description='Print glowfic')
-    parser.add_argument(
-        '--cache_path',
-        metavar='PATH',
-        help='Where to keep the http cache (instead of %(default)s)',
-        default=os.path.join(xdg_cache_home(), "paperdoorknob"))
-    parser.add_argument(
-        '--out',
-        help='The filename stem at which to write output ' +
-             '(eg: "%(default)s" produces %(default)s.text, %(default)s.pdf, etc.)',
-        default='book')
-    parser.add_argument('--pandoc', help='Location of the pandoc executable')
-    parser.add_argument(
-        '--timeout',
-        help='How long to wait for HTTP requests, in seconds',
-        default=30)
-    parser.add_argument('url', help='URL to retrieve')
-    return parser
-
-
-def fetch(url: str, fetcher: Fetcher) -> BeautifulSoup:
-    return BeautifulSoup(fetcher.fetch(url), 'html.parser')
+def parse(content: bytes) -> BeautifulSoup:
+    return BeautifulSoup(content, 'html.parser')
 
 
 def clean(html: BeautifulSoup) -> BeautifulSoup:
@@ -68,30 +44,17 @@ def replies(html: BeautifulSoup) -> Iterable[Tag]:
     return itertools.chain([text()], the_replies())
 
 
-def html_to_tex(pandoc: str, tag: Tag) -> bytes:
-    return subprocess.run([pandoc, '--from=html', '--to=latex'],
-                          input=tag.encode(),
-                          stdout=subprocess.PIPE,
-                          check=True).stdout
-
-
-def process(
-        url: str,
-        fetcher: Fetcher,
-        texout: IO[bytes],
-        pandoc: str) -> None:
-    texout.write(b'\\documentclass{article}\n\\begin{document}\n')
-    html = clean(fetch(url, fetcher))
+def process(spec: Spec) -> None:
+    spec.texout.write(b'\\documentclass{article}\n\\begin{document}\n')
+    html = clean(parse(spec.htmlfilter(spec.fetcher.fetch(spec.url))))
     for r in replies(html):
-        texout.write(html_to_tex(pandoc, r))
-    texout.write(b'\\end{document}\n')
+        spec.texout.write(spec.texifier.texify(r))
+    spec.texout.write(b'\\end{document}\n')
 
 
 def main() -> None:
-    args = command_line_parser().parse_args()
-    with CachingFetcher(args.cache_path, args.timeout) as fetcher:
-        with open(args.out + '.tex', 'wb') as texout:
-            process(args.url, fetcher, texout, args.pandoc or 'pandoc')
+    with spec_from_commandline_args() as spec:
+        process(spec)
 
 
 if __name__ == '__main__':