Skip to content

Fix filtered MusicBrainz track totals #6887

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.

Sign up for GitHub

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

Draft
iamdhrv wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −11
Draft

Fix filtered MusicBrainz track totals #6887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions beetsplug/musicbrainz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,12 +562,6 @@ def get_tracks_from_medium(self, medium: Medium) -> Iterable[TrackInfo]:
if not self.ignore_data_tracks:
all_tracks.extend(medium.get("data_tracks", []))

medium_data = {
"medium": medium["position"],
"medium_total": medium["track_count"],
"disctitle": medium["title"],
"media": medium["format"],
}
valid_tracks = [
t
for t in all_tracks
Expand All @@ -578,6 +572,12 @@ def get_tracks_from_medium(self, medium: Medium) -> Iterable[TrackInfo]:
and not (self.ignore_video_tracks and t["recording"]["video"])
)
]
medium_data = {
"medium": medium["position"],
"medium_total": len(valid_tracks),
"disctitle": medium["title"],
"media": medium["format"],
}
for track in valid_tracks:
# make a copy since we need to modify it with track-level overrides
recording = track["recording"].copy()
Expand Down
21 changes: 16 additions & 5 deletions test/plugins/test_musicbrainz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,23 +411,32 @@ def test_missing_tracks(self, mb):
assert mb.album_info(release).mediums == 2

@pytest.mark.parametrize(
"beets_match_config, expected_titles",
"beets_match_config, expected_titles, expected_medium_total",
[
_p({}, ("Audio",), id="only audio tracks by default"),
_p({}, ("Audio",), 1, id="only audio tracks by default"),
_p(
{"ignore_data_tracks": False},
("Audio", "Data"),
2,
id="include data tracks",
),
_p(
{"ignore_data_tracks": False, "ignore_video_tracks": False},
("Audio", "Video: Video", "Data"),
3,
id="include data and video tracks",
),
_p({"ignored_media": "Vinyl"}, (), id="ignore all tracks"),
_p({"ignored_media": "Vinyl"}, (), 0, id="ignore all tracks"),
],
)
def test_data_tracks(self, config, beets_match_config, mb, expected_titles):
def test_data_tracks(
self,
config,
beets_match_config,
mb,
expected_titles,
expected_medium_total,
):
medium = medium_factory(
format="Vinyl",
tracks=[
Expand All @@ -441,9 +450,11 @@ def test_data_tracks(self, config, beets_match_config, mb, expected_titles):

config.set({"match": beets_match_config})

actual_titles = tuple(t.title for t in mb.album_info(release).tracks)
tracks = mb.album_info(release).tracks
actual_titles = tuple(t.title for t in tracks)

assert actual_titles == expected_titles
assert all(t.medium_total == expected_medium_total for t in tracks)


class TestParseRelease(MusicBrainzPluginTestMixin):
Expand Down
Loading