Fix flaky test: Increment request count before responding

[paperdoorknob] / paperdoorknob.py

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

-from argparse import ArgumentParser
-import itertools
-import os.path
-
-from typing import Iterable
-

 from bs4 import BeautifulSoup
 from bs4 import BeautifulSoup

-from bs4.element import Tag
-import requests
-import requests_cache
-from xdg_base_dirs import xdg_cache_home
-
-
-class Post:
-    def __init__(self, html: BeautifulSoup) -> None:
-        self._html = html
-        for eb in self._html.find_all("div", class_="post-edit-box"):
-            eb.decompose()
-        for footer in self._html.find_all("div", class_="post-footer"):
-            footer.decompose()
-
-    def text(self) -> Tag:
-        body = self._html.body
-        assert body
-        text = body.find_next("div", class_="post-post")
-        assert isinstance(text, Tag)
-        return text
-
-    def replies(self) -> Iterable[Tag]:
-        replies = self._html.find_all("div", class_="post-reply")
-        assert all(isinstance(r, Tag) for r in replies)
-        return replies

 
 

-    def entries(self) -> Iterable[Tag]:
-        return itertools.chain([self.text()], self.replies())
+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{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()
-    with requests_cache.CachedSession(args.cache_path, cache_control=True) as session:
-        html = fetch(args.url, session, args.timeout)
-        Post(html)
+    with spec_from_commandline_args() as spec:
+        process(spec)

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