Skip to content

Commit

Permalink
fix: don't include empty pre_load, load and post_load tags by default
Browse files Browse the repository at this point in the history
  • Loading branch information
vberlier committed Jan 18, 2022
1 parent 6722cf3 commit 38a3d31
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 21 deletions.
10 changes: 1 addition & 9 deletions beet/contrib/lantern_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def beet_default(ctx: Context):
f"{id}:load",
]

ctx.data.function_tags["load:load"].data["values"].append(f"#{id}:load")
ctx.data.function_tags.setdefault("load:load", FunctionTag()).add(f"#{id}:load")
ctx.data[f"{id}:load"] = FunctionTag({"values": load_tag_values})

# Generate and join version checks for all the dependencies.
Expand Down Expand Up @@ -73,11 +73,3 @@ def base_data_pack(ctx: Context):
"scoreboard players reset * load.status",
]
)

ctx.data.function_tags.merge(
{
"load:pre_load": FunctionTag(),
"load:load": FunctionTag(),
"load:post_load": FunctionTag(),
}
)
14 changes: 14 additions & 0 deletions beet/library/data_pack.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,20 @@ def prepend(self: TagFileType, other: TagFileType) -> bool: # type: ignore
if value not in values:
values.insert(0, deepcopy(value))

def add(self, value: str):
"""Add an entry."""
values = self.data.setdefault("values", [])
if value not in values:
values.append(value)

def remove(self, value: str):
"""Remove an entry."""
values = self.data.setdefault("values", [])
try:
values.remove(value)
except ValueError:
pass

@classmethod
def default(cls) -> JsonDict:
return {"values": []}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 38a3d31

Please sign in to comment.