feat: support overlays (#434)

* feat: support overlays * chore: better merging * feat: bump 1.20 pack format
mcbeet · Oct 7, 2023 · 951764f · 951764f
1 parent 4b0170b
commit 951764f
Show file tree

Hide file tree

Showing 234 changed files with 708 additions and 266 deletions.
diff --git a/beet/core/container.py b/beet/core/container.py
@@ -56,6 +56,8 @@ def merge(self, other: Any) -> bool:
 class MergeMixin:
     def merge(self, other: Mapping[Any, SupportsMerge]) -> bool:
         """Merge values from the given dict-like object."""
+        if self is other:
+            return True
         for key, value in other.items():
             try:
                 if key not in self or not self[key].merge(value):  # type: ignore

diff --git a/beet/core/utils.py b/beet/core/utils.py
@@ -1,6 +1,8 @@
 __all__ = [
     "JsonDict",
     "FileSystemPath",
+    "TextComponent",
+    "SupportedFormats",
     "Sentinel",
     "SENTINEL_OBJ",
     "dump_json",
@@ -68,6 +70,7 @@ def __fspath__(self) -> str:
 JsonDict = Dict[str, Any]
 FileSystemPath = Union[str, PathLikeFallback]
 TextComponent = Union[str, List[Any], JsonDict]
+SupportedFormats = Union[int, List[int], JsonDict]
 
 
 class Sentinel: