Skip to content

Refactor of metadata plugin and opt in all metadata plugins to new baseclass #5787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions beets/autotag/match.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import lap
import numpy as np

from beets import config, logging, plugins
from beets import config, logging, metadata_plugins
from beets.autotag import (
AlbumInfo,
AlbumMatch,
Expand Down Expand Up @@ -213,7 +213,7 @@ def track_distance(
dist.add_expr("medium", item.disc != track_info.medium)

# Plugins.
dist.update(plugins.track_distance(item, track_info))
dist.update(metadata_plugins.track_distance(item, track_info))

return dist

Expand Down Expand Up @@ -330,7 +330,7 @@ def distance(
dist.add("unmatched_tracks", 1.0)

# Plugins.
dist.update(plugins.album_distance(items, album_info, mapping))
dist.update(metadata_plugins.album_distance(items, album_info, mapping))

return dist

Expand All @@ -356,7 +356,7 @@ def match_by_id(items: Iterable[Item]) -> AlbumInfo | None:
return None
# If all album IDs are equal, look up the album.
log.debug("Searching for discovered album ID: {0}", first)
return plugins.album_for_id(first)
return metadata_plugins.album_for_id(first)


def _recommendation(
Expand Down Expand Up @@ -511,7 +511,7 @@ def tag_album(
if search_ids:
for search_id in search_ids:
log.debug("Searching for album ID: {0}", search_id)
if info := plugins.album_for_id(search_id):
if info := metadata_plugins.album_for_id(search_id):
_add_candidate(items, candidates, info)

# Use existing metadata or text search.
Expand Down Expand Up @@ -548,7 +548,7 @@ def tag_album(
log.debug("Album might be VA: {0}", va_likely)

# Get the results from the data sources.
for matched_candidate in plugins.candidates(
for matched_candidate in metadata_plugins.candidates(
items, search_artist, search_album, va_likely
):
_add_candidate(items, candidates, matched_candidate)
Expand Down Expand Up @@ -583,7 +583,7 @@ def tag_item(
if trackids:
for trackid in trackids:
log.debug("Searching for track ID: {0}", trackid)
if info := plugins.track_for_id(trackid):
if info := metadata_plugins.track_for_id(trackid):
dist = track_distance(item, info, incl_artist=True)
candidates[info.track_id] = hooks.TrackMatch(dist, info)
# If this is a good match, then don't keep searching.
Expand All @@ -609,7 +609,7 @@ def tag_item(
log.debug("Item search terms: {0} - {1}", search_artist, search_title)

# Get and evaluate candidate metadata.
for track_info in plugins.item_candidates(
for track_info in metadata_plugins.item_candidates(
item, search_artist, search_title
):
dist = track_distance(item, track_info, incl_artist=True)
Expand Down
Loading