fix: merge files from auto_yaml

mcbeet · Jan 22, 2022 · 766ab0e · 766ab0e
1 parent c3083a4
commit 766ab0e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/beet/contrib/auto_yaml.py b/beet/contrib/auto_yaml.py
@@ -61,7 +61,7 @@ class AutoYamlNamespaceHandler(YamlFile, NamespaceFile):
 
         def bind(self, pack: Any, path: str):
             super().bind(pack, path)
-            pack[path] = file_type(dump_json(self.data))
+            pack[file_type].merge({path: file_type(dump_json(self.data))})
             raise Drop()
 
     return AutoYamlNamespaceHandler
@@ -76,7 +76,7 @@ def create_extra_handler(
     class AutoYamlExtraHandler(YamlFile):
         def bind(self, pack: Any, path: str):
             super().bind(pack, path)
-            pack.extra[filename] = file_type(dump_json(self.data))
+            pack.extra.merge({filename: file_type(dump_json(self.data))})
             raise Drop()
 
     return AutoYamlExtraHandler
@@ -92,7 +92,7 @@ class AutoYamlExtraHandler(YamlFile):
         def bind(self, pack: Any, path: str):
             super().bind(pack, path)
             namespace, _, path = path.partition(":")
-            pack[namespace].extra[filename] = file_type(dump_json(self.data))
+            pack[namespace].extra.merge({filename: file_type(dump_json(self.data))})
             raise Drop()
 
     return AutoYamlExtraHandler
diff --git a/examples/load_auto_yaml/beet.yml b/examples/load_auto_yaml/beet.yml
@@ -2,6 +2,6 @@ require:
   - demo.installation_message
   - beet.contrib.auto_yaml
 data_pack:
-  load: [src]
+  load: [src, other]
 resource_pack:
   load: [src]
diff --git a/examples/load_auto_yaml/other/data/minecraft/tags/functions/tick.yml b/examples/load_auto_yaml/other/data/minecraft/tags/functions/tick.yml
@@ -0,0 +1,2 @@
+values:
+  - demo:f2
diff --git a/examples/load_auto_yaml/src/data/minecraft/tags/functions/tick.yml b/examples/load_auto_yaml/src/data/minecraft/tags/functions/tick.yml
@@ -0,0 +1,2 @@
+values:
+  - demo:f1
diff --git a/...shots/examples__build_load_auto_yaml__0.data_pack/data/minecraft/tags/functions/tick.json b/...shots/examples__build_load_auto_yaml__0.data_pack/data/minecraft/tags/functions/tick.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "demo:f1",
+    "demo:f2"
+  ]
+}