Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-30 12:32:33 +01:00
Code Issues Projects Releases Wiki Activity

Refactor tests, adjust changelog, move config option to new features.

Browse source
This commit is contained in:
Henry Oberholtzer 2025-09-22 19:47:50 +02:00
parent e577df0f25
commit 8e644157e8
2 changed files with 38 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/changelog.rst
View file

@ -11,6 +11,8 @@ New features:
- :doc:`plugins/lastgenre`: Add a ``--pretend`` option to preview genre changes
without storing or writing them.
- :doc:`plugins/discogs`: New config option `strip_disambiguation` to toggle
stripping discogs numeric disambiguation on artist and label fields.
Bug fixes:
@ -21,12 +23,8 @@ Bug fixes:
- :doc:`plugins/spotify` Removed old and undocumented config options
`artist_field`, `album_field` and `track` that were causing issues with track
matching. :bug:`5189`
- :doc:`plugins/discogs` Added config option `strip_disambiguation` to allow
choice of removing discogs numeric disambiguation :bug:`5366`
- :doc:`plugins/discogs` Fixed inconsistency in stripping disambiguation from
artists but not labels. :bug:`5366`
- :doc:`plugins/discogs` Wrote test coverage for removing disambiguation.
:bug:`5366`
For packagers:
@ -40,8 +38,9 @@ Other changes:
possibly disabled musicbrainz plugin :bug:`6020`
- Moved ``art.py`` utility module from ``beets`` into ``beetsplug`` namespace as
it is not used in the core beets codebase. It can now be found in
``beetsplug._utils``. - :class:`beets.metadata_plugin.MetadataSourcePlugin`:
Remove discogs specific disambiguation stripping
``beetsplug._utils``.
- :class:`beets.metadata_plugin.MetadataSourcePlugin`: Remove discogs specific
disambiguation stripping.
2.4.0 (September 13, 2025)
--------------------------

89
test/plugins/test_discogs.py
View file

@ -374,38 +374,26 @@ class DGAlbumInfoTest(BeetsTestCase):
assert d.genre == "GENRE1, GENRE2"
assert d.style is None
def test_strip_disambiguation_label_artist(self):
"""Test removing discogs disambiguation from artist and label"""
def test_strip_disambiguation(self):
"""Test removing disambiguation from all disambiguated fields."""
data = {
"id": 123,
"uri": "https://www.discogs.com/release/123456-something",
"tracklist": [self._make_track("A", "1", "01:01")],
"artists": [{"name": "ARTIST NAME (2)", "id": 321, "join": ""}],
"title": "TITLE",
"labels": [
"tracklist": [
{
"name": "LABEL NAME (5)",
"catno": "CATALOG NUMBER",
"title": "track",
"position": "A",
"type_": "track",
"duration": "5:44",
"artists": [
{"name": "TEST ARTIST (5)", "tracks": "", "id": 11146}
],
}
],
}
release = Bag(
data=data,
title=data["title"],
artists=[Bag(data=d) for d in data["artists"]],
)
d = DiscogsPlugin().get_album_info(release)
assert d.artist == "ARTIST NAME"
assert d.label == "LABEL NAME"
def test_strip_disambiguation_off_label_artist(self):
"""Test not removing discogs disambiguation from artist and label"""
config["discogs"]["strip_disambiguation"] = False
data = {
"id": 123,
"uri": "https://www.discogs.com/release/123456-something",
"tracklist": [self._make_track("a", "1", "01:01")],
"artists": [{"name": "ARTIST NAME (2)", "id": 321, "join": ""}],
"artists": [
{"name": "ARTIST NAME (2)", "id": 321, "join": "&"},
{"name": "OTHER ARTIST (5)", "id": 321, "join": ""},
],
"title": "title",
"labels": [
{
@ -420,30 +408,13 @@ class DGAlbumInfoTest(BeetsTestCase):
artists=[Bag(data=d) for d in data["artists"]],
)
d = DiscogsPlugin().get_album_info(release)
assert d.artist == "ARTIST NAME (2)"
assert d.label == "LABEL NAME (5)"
def test_strip_disambiguation_multiple_artists(self):
"""Test removing disambiguation if there are multiple artists on the release"""
data = {
"id": 123,
"uri": "https://www.discogs.com/release/123456-something",
"tracklist": [self._make_track("a", "1", "01:01")],
"artists": [
{"name": "ARTIST NAME (2)", "id": 321, "join": "&"},
{"name": "OTHER ARTIST (5)", "id": 321, "join": ""},
],
"title": "title",
}
release = Bag(
data=data,
title=data["title"],
artists=[Bag(data=d) for d in data["artists"]],
)
d = DiscogsPlugin().get_album_info(release)
assert d.artist == "ARTIST NAME & OTHER ARTIST"
assert d.tracks[0].artist == "TEST ARTIST"
assert d.label == "LABEL NAME"
def test_strip_disambiguation_artist_tracks(self):
def test_strip_disambiguation_false(self):
"""Test disabling disambiguation removal from all disambiguated fields."""
config["discogs"]["strip_disambiguation"] = False
data = {
"id": 123,
"uri": "https://www.discogs.com/release/123456-something",
@ -454,16 +425,21 @@ class DGAlbumInfoTest(BeetsTestCase):
"type_": "track",
"duration": "5:44",
"artists": [
{
"name": "TEST ARTIST (5)",
"tracks": "",
"id": 11146,
}
{"name": "TEST ARTIST (5)", "tracks": "", "id": 11146}
],
}
],
"artists": [{"name": "OTHER ARTIST (5)", "id": 321, "join": ""}],
"artists": [
{"name": "ARTIST NAME (2)", "id": 321, "join": "&"},
{"name": "OTHER ARTIST (5)", "id": 321, "join": ""},
],
"title": "title",
"labels": [
{
"name": "LABEL NAME (5)",
"catno": "catalog number",
}
],
}
release = Bag(
data=data,
@ -471,8 +447,9 @@ class DGAlbumInfoTest(BeetsTestCase):
artists=[Bag(data=d) for d in data["artists"]],
)
d = DiscogsPlugin().get_album_info(release)
assert d.tracks[0].artist == "TEST ARTIST"
assert d.artist == "OTHER ARTIST"
assert d.artist == "ARTIST NAME (2) & OTHER ARTIST (5)"
assert d.tracks[0].artist == "TEST ARTIST (5)"
assert d.label == "LABEL NAME (5)"
@pytest.mark.parametrize(