Skip to content

Commit b643fc4

Browse files
committed
Do not show a warning to users that have musicbrainz disabled
1 parent 3bb068a commit b643fc4

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

beets/config_default.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ statefile: state.pickle
77
# --------------- Plugins ---------------
88

99
plugins: []
10+
disabled_plugins: []
1011

1112
pluginpath: []
1213

beets/plugins.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -414,23 +414,24 @@ def get_plugin_names() -> list[str]:
414414
# *contain* a `beetsplug` package.
415415
sys.path += paths
416416
plugins = unique_list(beets.config["plugins"].as_str_seq())
417+
beets.config.add({"disabled_plugins": []})
418+
disabled_plugins = set(beets.config["disabled_plugins"].as_str_seq())
417419
# TODO: Remove in v3.0.0
418-
if "musicbrainz" not in plugins:
420+
if "musicbrainz" not in plugins and "musicbrainz" not in disabled_plugins:
419421
deprecate_for_user(
420422
log,
421423
"Automatic loading of 'musicbrainz' plugin",
422424
"'plugins' configuration to explicitly add 'musicbrainz'",
423425
)
424-
enabled = beets.config["musicbrainz"].flatten().get("enabled")
425-
if enabled is not None:
426-
deprecate_for_user(
427-
log, "'musicbrainz.enabled' configuration option"
428-
)
429-
if enabled is not False:
430-
plugins.append("musicbrainz")
431426

432-
beets.config.add({"disabled_plugins": []})
433-
disabled_plugins = set(beets.config["disabled_plugins"].as_str_seq())
427+
enabled = beets.config["musicbrainz"].flatten().get("enabled")
428+
if enabled is not None:
429+
deprecate_for_user(log, "'musicbrainz.enabled' configuration option")
430+
if enabled is False:
431+
disabled_plugins.add("musicbrainz")
432+
else:
433+
plugins.append("musicbrainz")
434+
434435
return [p for p in plugins if p not in disabled_plugins]
435436

436437

0 commit comments

Comments
 (0)