feat: handle load mount

beet/contrib/load.py

@@ -8,15 +8,17 @@
 
 
 from glob import glob
+from pathlib import Path
+from zipfile import ZipFile
 
 from pydantic import BaseModel
 
-from beet import Context, ErrorMessage, ListOption, PackageablePath, configurable
+from beet import Context, ErrorMessage, PackLoadOptions, configurable
 
 
 class LoadOptions(BaseModel):
-    resource_pack: ListOption[PackageablePath] = ListOption()
-    data_pack: ListOption[PackageablePath] = ListOption()
+    resource_pack: PackLoadOptions = PackLoadOptions()
+    data_pack: PackLoadOptions = PackLoadOptions()
 
 
 def beet_default(ctx: Context):
@@ -27,9 +29,24 @@ def beet_default(ctx: Context):
 def load(ctx: Context, opts: LoadOptions):
     """Plugin that loads data packs and resource packs."""
     for load_options, pack in zip([opts.resource_pack, opts.data_pack], ctx.packs):
-        for pattern in load_options.entries():
-            if paths := glob(str(ctx.directory / pattern)):
-                for path in paths:
-                    pack.load(path)
+        for load_entry in load_options.entries():
+            if isinstance(load_entry, dict):
+                for prefix, mount_options in load_entry.items():
+                    entries = [
+                        Path(entry)
+                        for pattern in mount_options.entries()
+                        for entry in glob(str(ctx.directory / pattern))
+                    ]
+                    if not entries:
+                        raise ErrorMessage(f'Couldn\'t mount "{prefix}".')
+                    for entry in entries:
+                        dst = f"{prefix}/{entry.name}" if len(entries) > 1 else prefix
+                        if entry.is_file() and entry.suffix == ".zip":
+                            entry = ZipFile(entry)
+                        pack.mount(dst, entry)
             else:
-                raise ErrorMessage(f'Couldn\'t load "{pattern}".')
+                if paths := glob(str(ctx.directory / load_entry)):
+                    for path in paths:
+                        pack.load(path)
+                else:
+                    raise ErrorMessage(f'Couldn\'t load "{load_entry}".')

beet/toolchain/config.py

@@ -1,6 +1,7 @@
 __all__ = [
     "ProjectConfig",
     "PackConfig",
+    "PackLoadOptions",
     "ListOption",
     "PackageablePath",
     "InvalidProjectConfig",
@@ -111,6 +112,33 @@ def __str__(self) -> str:
         return str(self.__root__)
 
 
+class PackLoadOptions(
+    ListOption[Union[PackageablePath, Dict[str, ListOption[PackageablePath]]]]
+):
+    """Options for loading data packs and resource packs."""
+
+    def resolve(self, directory: FileSystemPath) -> "PackLoadOptions":
+        """Resolve load options relative to the given directory."""
+        return PackLoadOptions.parse_obj(
+            [
+                (
+                    {
+                        prefix: ListOption.parse_obj(
+                            [
+                                pattern.resolve(directory)
+                                for pattern in mount_options.entries()
+                            ]
+                        )
+                        for prefix, mount_options in load_entry.items()
+                    }
+                    if isinstance(load_entry, dict)
+                    else load_entry.resolve(directory)
+                )
+                for load_entry in self.entries()
+            ]
+        )
+
+
 class PackConfig(BaseModel):
     """Data pack and resource pack configuration."""
 
@@ -121,7 +149,7 @@ class PackConfig(BaseModel):
     compression: Optional[Literal["none", "deflate", "bzip2", "lzma"]] = None
     compression_level: Optional[int] = None
 
-    load: ListOption[PackageablePath] = ListOption()
+    load: PackLoadOptions = PackLoadOptions()
     render: Dict[str, ListOption[str]] = {}
 
     class Config:
@@ -195,9 +223,7 @@ def resolve(self, directory: FileSystemPath) -> "ProjectConfig":
         )
 
         for pack_config in [self.data_pack, self.resource_pack]:
-            pack_config.load = ListOption.parse_obj(
-                [load_path.resolve(path) for load_path in pack_config.load.entries()]
-            )
+            pack_config.load = pack_config.load.resolve(path)
 
         self.pipeline = [
             item.resolve(path) if isinstance(item, ProjectConfig) else item

examples/code_mount_load/beet.yml

@@ -0,0 +1,2 @@
+pipeline:
+  - demo

examples/code_mount_load/demo.py

@@ -0,0 +1,19 @@
+from beet import Context
+from beet.contrib.load import load
+
+
+def beet_default(ctx: Context):
+    ctx.require(
+        load(
+            data_pack={
+                "data/demo/functions": ctx.directory / "src",
+                "data/owo/functions/foo.mcfunction": ctx.directory / "src/thing.txt",
+                "pack.mcmeta": ctx.directory / "pack.mcmeta",
+            },
+            resource_pack={
+                "assets/minecraft": ctx.directory / "src",
+                "assets/other/sounds.json": ctx.directory / "src/sounds.json",
+                "not_in_schema.txt": ctx.directory / "pack.mcmeta",
+            },
+        )
+    )

examples/code_mount_load/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": "aaaaaa"
+  }
+}

examples/code_mount_load/src/bar.mcfunction

@@ -0,0 +1 @@
+say bar

examples/code_mount_load/src/foo.mcfunction

@@ -0,0 +1 @@
+say foo

examples/code_mount_load/src/sounds.json

@@ -0,0 +1 @@
+{}

examples/code_mount_load/src/thing.txt

@@ -0,0 +1 @@
+say thing

examples/load_mount/beet.yml

@@ -0,0 +1,10 @@
+data_pack:
+  load:
+    data/demo/functions: "src"
+    data/owo/functions/foo.mcfunction: "src/thing.txt"
+    pack.mcmeta: "pack.mcmeta"
+resource_pack:
+  load:
+    assets/minecraft: "src"
+    assets/other/sounds.json: "src/sounds.json"
+    not_in_schema.txt: "pack.mcmeta"

examples/load_mount/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": "aaaaaa"
+  }
+}

examples/load_mount/src/bar.mcfunction

@@ -0,0 +1 @@
+say bar

examples/load_mount/src/foo.mcfunction

@@ -0,0 +1 @@
+say foo

examples/load_mount/src/sounds.json

@@ -0,0 +1 @@
+{}

examples/load_mount/src/thing.txt

@@ -0,0 +1 @@
+say thing

examples/load_mount_glob/beet.yml

@@ -0,0 +1,4 @@
+data_pack:
+  load:
+    data/demo/functions:
+      - "src/*.mcfunction"

examples/load_mount_glob/src/bar.mcfunction

@@ -0,0 +1 @@
+say bar

examples/load_mount_glob/src/foo.mcfunction

@@ -0,0 +1 @@
+say foo

examples/load_mount_zip/beet.yml

@@ -0,0 +1,6 @@
+data_pack:
+  load:
+    data/demo/functions: "src.zip"
+resource_pack:
+  load:
+    assets/minecraft: "src.zip"

tests/snapshots/examples__build_code_mount_load__0.data_pack/data/demo/functions/bar.mcfunction

@@ -0,0 +1 @@
+say bar

tests/snapshots/examples__build_code_mount_load__0.data_pack/data/demo/functions/foo.mcfunction

@@ -0,0 +1 @@
+say foo

tests/snapshots/examples__build_code_mount_load__0.data_pack/data/owo/functions/foo.mcfunction

@@ -0,0 +1 @@
+say thing

tests/snapshots/examples__build_code_mount_load__0.data_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": "aaaaaa"
+  }
+}

tests/snapshots/examples__build_code_mount_load__1.resource_pack/assets/minecraft/sounds.json

@@ -0,0 +1 @@
+{}

tests/snapshots/examples__build_code_mount_load__1.resource_pack/assets/other/sounds.json

@@ -0,0 +1 @@
+{}

tests/snapshots/examples__build_code_mount_load__1.resource_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 8,
+    "description": ""
+  }
+}

tests/snapshots/examples__build_load_mount__0.data_pack/data/demo/functions/bar.mcfunction

@@ -0,0 +1 @@
+say bar

tests/snapshots/examples__build_load_mount__0.data_pack/data/demo/functions/foo.mcfunction

@@ -0,0 +1 @@
+say foo

tests/snapshots/examples__build_load_mount__0.data_pack/data/owo/functions/foo.mcfunction

@@ -0,0 +1 @@
+say thing

tests/snapshots/examples__build_load_mount__0.data_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": "aaaaaa"
+  }
+}

tests/snapshots/examples__build_load_mount__1.resource_pack/assets/minecraft/sounds.json

@@ -0,0 +1 @@
+{}

tests/snapshots/examples__build_load_mount__1.resource_pack/assets/other/sounds.json

@@ -0,0 +1 @@
+{}

tests/snapshots/examples__build_load_mount__1.resource_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 8,
+    "description": ""
+  }
+}

tests/snapshots/examples__build_load_mount_glob__0.data_pack/data/demo/functions/bar.mcfunction

@@ -0,0 +1 @@
+say bar

tests/snapshots/examples__build_load_mount_glob__0.data_pack/data/demo/functions/foo.mcfunction

@@ -0,0 +1 @@
+say foo

tests/snapshots/examples__build_load_mount_glob__0.data_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": ""
+  }
+}

tests/snapshots/examples__build_load_mount_glob__1.resource_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 8,
+    "description": ""
+  }
+}

tests/snapshots/examples__build_load_mount_zip__0.data_pack/data/demo/functions/bar.mcfunction

@@ -0,0 +1 @@
+say bar

tests/snapshots/examples__build_load_mount_zip__0.data_pack/data/demo/functions/foo.mcfunction

@@ -0,0 +1 @@
+say foo

tests/snapshots/examples__build_load_mount_zip__0.data_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 9,
+    "description": ""
+  }
+}

tests/snapshots/examples__build_load_mount_zip__1.resource_pack/assets/minecraft/sounds.json

@@ -0,0 +1 @@
+{}

tests/snapshots/examples__build_load_mount_zip__1.resource_pack/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 8,
+    "description": ""
+  }
+}