privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

packages/reflex-cache: pass content to ipfs_fetch_task directly if possible

Browse source
This commit is contained in:
Max Headroom 2023-11-10 00:53:49 +01:00
parent 089e570054
commit 4f9e72af6c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/servers/reflex-cache/reflex_cache/ipfs.py
View file

@ -13,9 +13,12 @@ class IPFSController:
self.__nix = nixCache
self.__db = db
def ipfs_fetch_task(self, callback, nar, hint=None):
print(f"Downloading NAR: {nar}")
code, _, content = self.__nix.try_all("get", nar, hint)
def ipfs_fetch_task(self, callback, nar, hint=None, content=None):
if content == None:
print(f"Downloading NAR: {nar}")
code, _, content = self.__nix.try_all("get", nar, hint)
else:
code = 200
if code == 200:
if nar.endswith(".nar.xz"):
print(f"Attempt decompression of {nar}")

4
packages/servers/reflex-cache/reflex_cache/service_handler.py
View file

@ -49,7 +49,7 @@ class ReflexHTTPServiceHandler(BaseHTTPRequestHandler):
resultHash = self._db.get_path(self.path)
if resultHash == None:
code, cache, _ = self._nix.try_all("get", self.path)
code, cache, content = self._nix.try_all("get", self.path)
if code != 200:
self.send_response(404)
self.end_headers()
@ -75,7 +75,7 @@ class ReflexHTTPServiceHandler(BaseHTTPRequestHandler):
# already removed
pass
f = self._executor_nar.submit(
self._ipfs.ipfs_fetch_task, cb, self.path, cache
self._ipfs.ipfs_fetch_task, cb, self.path, cache, content
)
self._workSet.add((self.path, f))
_, code, resultHash = f.result()