Avoid requesting index by assuming package URL

Author: EpicWink

src/proxpi/_cache.py

@@ -199,14 +199,19 @@ def _list_files(self, package_name: str):
         if package and time.monotonic() < package.refreshed + self.ttl:
             return
 
-        if package_name not in self.list_packages():
-            raise NotFound(package_name)
-
         logger.debug(f"Listing files in package '{package_name}'")
-        package_url = self._index[package_name]
-        url = urllib.parse.urljoin(self.index_url, package_url)
-        response = self.session.get(url)
-        response.raise_for_status()
+        response = None
+        if time.monotonic() > (self._index_t or 0.0) + self.ttl:
+            url = urllib.parse.urljoin(self.index_url, package_name)
+            response = self.session.get(url)
+        if not response or not response.ok:
+            if package_name not in self.list_packages():
+                raise NotFound(package_name)
+            package_url = self._index[package_name]
+            url = urllib.parse.urljoin(self.index_url, package_url)
+            response = self.session.get(url)
+            response.raise_for_status()
+
         package = Package(package_name, files={}, refreshed=time.monotonic())
         tree = lxml.etree.parse(io.BytesIO(response.content), _html_parser)
 

src/proxpi/server.py

@@ -1,7 +1,6 @@
 """Cached package index server."""
 
 import os
-import sys
 import logging
 import urllib.parse
 
@@ -30,10 +29,6 @@
 app = flask.Flask("proxpi")
 app.jinja_loader = jinja2.PackageLoader("proxpi")
 cache = _cache.Cache.from_config()
-if "--help" not in sys.argv:
-    _cache_init_thread = _cache.Thread(target=cache.list_packages)
-    _cache_init_thread.start()
-    app.before_first_request_funcs.append(_cache_init_thread.join)
 if app.debug or app.testing:
     logging.root.setLevel(logging.DEBUG)
     for handler in logging.root.handlers: