X-Git-Url: http://git.scottworley.com/paperdoorknob/blobdiff_plain/47cfa3cdb4b4a7c6191e4a63b2a3080b52f076b0..929db57622c6b8756ed341d7ae2862126a7c638f:/paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 8329f83..34223e4 100644
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -5,38 +5,19 @@
 # Free Software Foundation, version 3.
 
 
-from argparse import ArgumentParser
 import itertools
-import os.path
 
 from typing import Iterable
 
 from bs4 import BeautifulSoup
 from bs4.element import Tag
-import requests
-import requests_cache
-from xdg_base_dirs import xdg_cache_home
 
+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(
-        '--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, 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 parse(content: bytes) -> BeautifulSoup:
+    return BeautifulSoup(content, 'html.parser')
 
 
 def clean(html: BeautifulSoup) -> BeautifulSoup:
@@ -63,18 +44,17 @@ def replies(html: BeautifulSoup) -> Iterable[Tag]:
     return itertools.chain([text()], the_replies())
 
 
-def process(
-        url: str,
-        session: requests.Session,
-        timeout: int) -> Iterable[Tag]:
-    html = clean(fetch(url, session, timeout))
-    return replies(html)
+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):
+        spec.texout.write(spec.texifier.texify(r))
+    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:
-        process(args.url, session, args.timeout)
+    with spec_from_commandline_args() as spec:
+        process(spec)
 
 
 if __name__ == '__main__':