image filenames: Drop ? and following query parameters

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index 8329f83e69e026791f6997a296a10af19ab4d2e1..4ee4dbc2a0fca7208d62ec9fd8c6e212087c5062 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -5,76 +5,40 @@
 # 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
-
-
-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 clean(html: BeautifulSoup) -> BeautifulSoup:
-    for eb in html.find_all("div", class_="post-edit-box"):
-        eb.decompose()
-    for footer in html.find_all("div", class_="post-footer"):
-        footer.decompose()
-    return html
-
 
-def replies(html: BeautifulSoup) -> Iterable[Tag]:
-    def text() -> Tag:
-        body = html.body
-        assert body
-        text = body.find_next("div", class_="post-post")
-        assert isinstance(text, Tag)
-        return text
+from args import spec_from_commandline_args
+from glowfic import chunkDOMs, flatURL, makeChunk
+from spec import Spec
 
-    def the_replies() -> Iterable[Tag]:
-        rs = html.find_all("div", class_="post-reply")
-        assert all(isinstance(r, Tag) for r in rs)
-        return rs
 
-    return itertools.chain([text()], the_replies())
+def parse(content: bytes) -> BeautifulSoup:
+    return BeautifulSoup(content, 'html.parser')
 
 
-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}
+\\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')
+    url = flatURL(spec.url)
+    html = parse(spec.htmlfilter(spec.fetcher.fetch(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:
-        process(args.url, session, args.timeout)
+    with spec_from_commandline_args() as spec:
+        process(spec)
 
 
 if __name__ == '__main__':