fetch: Honor Cache-Control headers

[paperdoorknob] / paperdoorknob.py

diff --git a/paperdoorknob.py b/paperdoorknob.py
index cd93e4ef69c24b84679432ac0a5d6435aff6e813..b7e4349b98ab1d97ae2ff0ad6f50e4740bb6440f 100644 (file)
--- a/paperdoorknob.py
+++ b/paperdoorknob.py
@@ -6,11 +6,19 @@
 
 
 from argparse import ArgumentParser
+import os.path
 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',
@@ -19,14 +27,15 @@ def command_line_parser() -> ArgumentParser:
     return parser
 
 
-def fetch(url: str, timeout: int) -> None:
-    r = requests.get(url, timeout=timeout)
-    r.raise_for_status()
+def fetch(url: str, session: requests.Session, timeout: int) -> None:
+    with session.get(url, timeout=timeout) as r:
+        r.raise_for_status()
 
 
 def main() -> None:
     args = command_line_parser().parse_args()
-    fetch(args.url, args.timeout)
+    with requests_cache.CachedSession(args.cache_path, cache_control=True) as session:
+        fetch(args.url, session, args.timeout)
 
 
 if __name__ == '__main__':