FakeFetcher: Show bad URLs in error messages

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index bb8bdd1ae38a660b3a6f90aa3d5aa317505beee3..5e5747c90e5c6483754e23d2a2d51014f656a312 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -5,39 +5,39 @@
 # Free Software Foundation, version 3.
 
 
-from argparse import ArgumentParser
-import os.path
 from bs4 import BeautifulSoup
-import requests
-import requests_cache
-from xdg_base_dirs import xdg_cache_home
 
+from args import spec_from_commandline_args
+from glowfic import chunkDOMs, makeChunk
+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(
-        '--timeout',
-        help='How long to wait for HTTP requests, in seconds',
-        default=30)
-    parser.add_argument('url', help='URL to retrieve')
-    return parser
 
+def parse(content: bytes) -> BeautifulSoup:
+    return BeautifulSoup(content, 'html.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 process(spec: Spec) -> None:
+    spec.texout.write(b'''\\documentclass{article}
+\\usepackage{graphicx}
+\\usepackage{varwidth}
+\\usepackage{wrapstuff}
+''')
+    if spec.geometry is not None:
+        spec.texout.write(b'\\usepackage[' +
+                          spec.geometry.encode('UTF-8') +
+                          b']{geometry}\n')
+    spec.texout.write(b'\\begin{document}\n')
+    html = parse(spec.htmlfilter(spec.fetcher.fetch(spec.url)))
+    for r in chunkDOMs(html):
+        spec.domfilter(r)
+        chunk = makeChunk(r, spec.images)
+        spec.texout.write(spec.layout.renderChunk(chunk))
+    spec.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:
-        fetch(args.url, session, args.timeout)
+    with spec_from_commandline_args() as spec:
+        process(spec)
 
 
 if __name__ == '__main__':