fix: load files by trying all the possible extensions

beet/library/base.py

@@ -62,7 +62,7 @@
 from beet.core.file import File, FileOrigin, JsonFile, PngFile
 from beet.core.utils import FileSystemPath, JsonDict, TextComponent
 
-from .utils import list_files
+from .utils import list_extensions, list_files
 
 T = TypeVar("T")
 PackFileType = TypeVar("PackFileType", bound="PackFile")
@@ -495,21 +495,25 @@ def scan(
                 name, namespace = namespace_dir, cls()
 
             assert name and namespace is not None
-            extension = "".join(filename.suffixes)
+            extensions = list_extensions(filename)
 
             if file_type := extra_info.get(path := "/".join(scope + [extra_name])):
                 namespace.extra[path] = file_type.load(pack, filename)
                 continue
 
             while path := tuple(scope):
-                if file_type := scope_map.get((path, extension)):
-                    key = "/".join(
-                        filename.relative_to(Path(directory, name, *path)).parts
-                    )[: -len(extension)]
+                for extension in extensions:
+                    if file_type := scope_map.get((path, extension)):
+                        key = "/".join(
+                            filename.relative_to(Path(directory, name, *path)).parts
+                        )[: -len(extension)]
 
-                    namespace[file_type][key] = file_type.load(pack, filename)
-                    break
-                scope.pop()
+                        namespace[file_type][key] = file_type.load(pack, filename)
+                        break
+                else:
+                    scope.pop()
+                    continue
+                break
 
         if name and namespace:
             yield name, namespace

beet/library/utils.py

@@ -1,11 +1,13 @@
 __all__ = [
     "list_files",
+    "list_extensions",
 ]
 
 
 import os
-from pathlib import Path
-from typing import Iterator
+from itertools import accumulate
+from pathlib import Path, PurePath
+from typing import Iterator, List
 
 from beet.core.utils import FileSystemPath
 
@@ -14,3 +16,11 @@ def list_files(directory: FileSystemPath) -> Iterator[Path]:
     for root, _, files in os.walk(directory):
         for filename in files:
             yield Path(root, filename).relative_to(directory)
+
+
+def list_extensions(path: PurePath) -> List[str]:
+    extensions: List[str] = list(
+        accumulate(reversed(path.suffixes), lambda a, b: b + a)  # type: ignore
+    )
+    extensions.reverse()
+    return extensions

examples/load_predicate/beet.yml

@@ -0,0 +1,2 @@
+data_pack:
+  load: [src]

examples/load_predicate/src/data/demo/predicates/chance/0.05.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.05
+}

examples/load_predicate/src/data/demo/predicates/chance/0.10.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.1
+}

examples/load_predicate/src/data/demo/predicates/chance/0.25.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.25
+}

examples/load_predicate/src/data/demo/predicates/chance/0.50.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.5
+}

tests/snapshots/examples__build_load_predicate__0.data_pack/data/demo/predicates/chance/0.05.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.05
+}

tests/snapshots/examples__build_load_predicate__0.data_pack/data/demo/predicates/chance/0.10.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.1
+}

tests/snapshots/examples__build_load_predicate__0.data_pack/data/demo/predicates/chance/0.25.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.25
+}

tests/snapshots/examples__build_load_predicate__0.data_pack/data/demo/predicates/chance/0.50.json

@@ -0,0 +1,4 @@
+{
+  "condition": "minecraft:random_chance",
+  "chance": 0.5
+}

tests/snapshots/examples__build_load_predicate__0.data_pack/pack.mcmeta

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

tests/snapshots/examples__build_load_predicate__1.resource_pack/pack.mcmeta

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