From c835a4b67463a5c1edec12d02feb54eab927420b Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Fri, 16 May 2025 17:28:28 +0100
Subject: [PATCH] Adds 60 second disk cache for unauthenticated indexes. Fixes
 #72

---
 src/manage/install_command.py |  2 +-
 src/manage/list_command.py    |  2 +-
 src/manage/urlutils.py        | 35 ++++++++++++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/manage/install_command.py b/src/manage/install_command.py
index 7d728d5..662fb6d 100644
--- a/src/manage/install_command.py
+++ b/src/manage/install_command.py
@@ -390,7 +390,7 @@ def _find_one(cmd, source, tag, *, installed=None, by_id=False):
     else:
         LOGGER.verbose("Searching for default Python version")
 
-    downloader = IndexDownloader(source, Index, {}, DOWNLOAD_CACHE)
+    downloader = IndexDownloader(source, Index, {}, DOWNLOAD_CACHE, None if cmd.force else cmd.download_dir)
     install = select_package(downloader, tag, cmd.default_platform, by_id=by_id)
 
     if by_id:
diff --git a/src/manage/list_command.py b/src/manage/list_command.py
index a13c787..6ac7ee1 100644
--- a/src/manage/list_command.py
+++ b/src/manage/list_command.py
@@ -277,7 +277,7 @@ def execute(cmd):
         from .urlutils import IndexDownloader
         try:
             installs = _get_installs_from_index(
-                IndexDownloader(cmd.source, Index),
+                IndexDownloader(cmd.source, Index, disk_cache=cmd.download_dir),
                 tags,
             )
         except OSError as ex:
diff --git a/src/manage/urlutils.py b/src/manage/urlutils.py
index dba371a..06848a7 100644
--- a/src/manage/urlutils.py
+++ b/src/manage/urlutils.py
@@ -625,20 +625,46 @@ def is_valid_url(url):
 
 
 class IndexDownloader:
-    def __init__(self, source, index_cls, auth=None, cache=None):
+    def __init__(self, source, index_cls, auth=None, cache=None, disk_cache=None):
         self.index_cls = index_cls
         self._url = source.rstrip("/")
         if not self._url.casefold().endswith(".json".casefold()):
             self._url += "/index.json"
         self._auth = auth if auth is not None else {}
         self._cache = cache if cache is not None else {}
+        self._disk_cache = Path(disk_cache) if disk_cache is not None else None
         self._urlopen = urlopen
+        self._used_auth = False
+
+    def _use_disk_cache(self, url, data=None):
+        if not self._disk_cache:
+            return None
+        try:
+            if extract_url_auth(url):
+                return None
+        except OSError:
+            return None
+        from hashlib import sha256
+        from time import time
+        path = self._disk_cache / (sha256(url.encode("utf-8", "unicodeescape")).hexdigest() + ".cache")
+        if data:
+            path.parent.mkdir(parents=True, exist_ok=True)
+            path.write_bytes(data)
+            return
+        try:
+            if time() - path.lstat().st_mtime < 60:
+                return path.read_bytes()
+            path.unlink()
+            return None
+        except OSError:
+            return None
 
     def __iter__(self):
         return self
 
     def on_auth(self, url):
         # TODO: Try looking for parent paths from URL
+        self._used_auth = True
         try:
             return self._auth[url]
         except LookupError:
@@ -658,14 +684,21 @@ def __next__(self):
         except LookupError:
             data = None
 
+        data = self._use_disk_cache(url)
+        if data:
+            LOGGER.debug("Fetched from disk cache")
+
         if not data:
             try:
+                self._used_auth = False
                 data = self._cache[url] = self._urlopen(
                     url,
                     "GET",
                     {"Accepts": "application/json"},
                     on_auth_request=self.on_auth,
                 )
+                if not self._used_auth:
+                    self._use_disk_cache(url, data)
             except FileNotFoundError: # includes 404
                 LOGGER.error("Unable to find runtimes index at %s", sanitise_url(url))
                 raise