Fix flaky test: Increment request count before responding

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index c684739e0a363ee310e27343a08effde2bb4dc89..f8b336194974668477b5739b74c014a00d7e7549 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -5,29 +5,38 @@
 # Free Software Foundation, version 3.
 
 
 # Free Software Foundation, version 3.
 
 

-from argparse import ArgumentParser
-import requests
+from bs4 import BeautifulSoup

 
 

+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(
-        '--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, timeout: int) -> None:
-    with requests.session() as s:
-        with s.get(url, timeout=timeout) as r:
-            r.raise_for_status()
+
+def process(spec: Spec) -> None:
+    spec.texout.write(b'''\\documentclass{article}
+\\usepackage{graphicx}
+\\usepackage{wrapfig}
+''')
+    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:
 
 
 def main() -> None:

-    args = command_line_parser().parse_args()
-    fetch(args.url, args.timeout)
+    with spec_from_commandline_args() as spec:
+        process(spec)

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':