From b643fc4ce509ab1e23e04ebc613d2c2ba2c937bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= Date: Sat, 25 Oct 2025 14:21:06 +0100 Subject: [PATCH] Do not show a warning to users that have musicbrainz disabled --- beets/config_default.yaml | 1 + beets/plugins.py | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/beets/config_default.yaml b/beets/config_default.yaml index 53763328f..376859602 100644 --- a/beets/config_default.yaml +++ b/beets/config_default.yaml @@ -7,6 +7,7 @@ statefile: state.pickle # --------------- Plugins --------------- plugins: [] +disabled_plugins: [] pluginpath: [] diff --git a/beets/plugins.py b/beets/plugins.py index b75581796..5f695712b 100644 --- a/beets/plugins.py +++ b/beets/plugins.py @@ -414,23 +414,24 @@ def get_plugin_names() -> list[str]: # *contain* a `beetsplug` package. sys.path += paths plugins = unique_list(beets.config["plugins"].as_str_seq()) + beets.config.add({"disabled_plugins": []}) + disabled_plugins = set(beets.config["disabled_plugins"].as_str_seq()) # TODO: Remove in v3.0.0 - if "musicbrainz" not in plugins: + if "musicbrainz" not in plugins and "musicbrainz" not in disabled_plugins: deprecate_for_user( log, "Automatic loading of 'musicbrainz' plugin", "'plugins' configuration to explicitly add 'musicbrainz'", ) - enabled = beets.config["musicbrainz"].flatten().get("enabled") - if enabled is not None: - deprecate_for_user( - log, "'musicbrainz.enabled' configuration option" - ) - if enabled is not False: - plugins.append("musicbrainz") - beets.config.add({"disabled_plugins": []}) - disabled_plugins = set(beets.config["disabled_plugins"].as_str_seq()) + enabled = beets.config["musicbrainz"].flatten().get("enabled") + if enabled is not None: + deprecate_for_user(log, "'musicbrainz.enabled' configuration option") + if enabled is False: + disabled_plugins.add("musicbrainz") + else: + plugins.append("musicbrainz") + return [p for p in plugins if p not in disabled_plugins]