Use the new encapsulated fetchers

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 91909a332552e285d6b5175fee5559b6557da096..f83c9f869651a0a35fd86fdf11fdb004e5e5ae4d 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -8,15 +8,16 @@
 from argparse import ArgumentParser
 import itertools
 import os.path
+import subprocess
 
 from typing import IO, Iterable
 
 from bs4 import BeautifulSoup
 from bs4.element import Tag
-import requests
-import requests_cache
 from xdg_base_dirs import xdg_cache_home
 
+from fetch import CachingFetcher, Fetcher
+
 
 def command_line_parser() -> ArgumentParser:
     parser = ArgumentParser(prog='paperdoorknob', description='Print glowfic')
@@ -30,6 +31,7 @@ def command_line_parser() -> ArgumentParser:
         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',
@@ -38,10 +40,8 @@ def command_line_parser() -> ArgumentParser:
     return parser
 
 
-def fetch(url: str, session: requests.Session, timeout: int) -> BeautifulSoup:
-    with session.get(url, timeout=timeout) as r:
-        r.raise_for_status()
-        return BeautifulSoup(r.text, 'html.parser')
+def fetch(url: str, fetcher: Fetcher) -> BeautifulSoup:
+    return BeautifulSoup(fetcher.fetch(url), 'html.parser')
 
 
 def clean(html: BeautifulSoup) -> BeautifulSoup:
@@ -68,22 +68,30 @@ 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,
-        session: requests.Session,
-        timeout: int,
-        texout: IO[str],
-) -> None:
-    html = clean(fetch(url, session, timeout))
-    replies(html)
-    print("soon", file=texout)
+        fetcher: Fetcher,
+        texout: IO[bytes],
+        pandoc: str) -> None:
+    texout.write(b'\\documentclass{article}\n\\begin{document}\n')
+    html = clean(fetch(url, fetcher))
+    for r in replies(html):
+        texout.write(html_to_tex(pandoc, r))
+    texout.write(b'\\end{document}\n')
 
 
 def main() -> None:
     args = command_line_parser().parse_args()
-    with requests_cache.CachedSession(args.cache_path, cache_control=True) as session:
-        with open(args.out + '.tex', 'w', encoding='UTF-8') as texout:
-            process(args.url, session, args.timeout, texout)
+    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')
 
 
 if __name__ == '__main__':