fix: better cache handeling by waiting for the result

Author: edayot

beet/core/cache.py

@@ -380,10 +380,19 @@ def download(self, arg: Union[str, Request], path: FileSystemPath) -> Path:
 
         if not path.is_file():
             fileobj = path.open("wb")
-            if self.executor:
-                self.executor.submit(self.retrieve, arg, fileobj)
-            else:
-                self.retrieve(arg, fileobj)
+            try:
+                if self.executor:
+                    future = self.executor.submit(self.retrieve, arg, fileobj)
+                    future.result()
+                else:
+                    self.retrieve(arg, fileobj)
+            except Exception as e:
+                try:
+                    fileobj.close()
+                    path.unlink()
+                except Exception:
+                    pass
+                raise e
 
         return path
 

examples/cache_test/beet.yml

@@ -0,0 +1,6 @@
+meta:
+  vanilla:
+    version: "1.21.8"
+
+pipeline:
+  - mre

examples/cache_test/mre.py

@@ -0,0 +1,6 @@
+from beet import Context
+from beet.contrib.vanilla import Vanilla
+
+
+def beet_default(ctx: Context):
+    ctx.inject(Vanilla).mount("assets/minecraft/font", fetch_objects=True)

tests/snapshots/examples__build_cache_test__0.data_pack/pack.mcmeta

@@ -0,0 +1,13 @@
+{
+  "pack": {
+    "min_format": [
+      88,
+      0
+    ],
+    "max_format": [
+      88,
+      0
+    ],
+    "description": ""
+  }
+}

tests/snapshots/examples__build_cache_test__1.resource_pack/pack.mcmeta

@@ -0,0 +1,13 @@
+{
+  "pack": {
+    "min_format": [
+      69,
+      0
+    ],
+    "max_format": [
+      69,
+      0
+    ],
+    "description": ""
+  }
+}