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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
kerobaros 2014-10-30 15:21:32 -05:00
commit 01432b5efa
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
beetsplug/discogs.py
View file

@ -196,7 +196,7 @@ class DiscogsPlugin(BeetsPlugin):
"""
artist_id = None
bits = []
for artist in artists:
for i, artist in enumerate(artists):
if not artist_id:
artist_id = artist['id']
name = artist['name']
@ -205,7 +205,7 @@ class DiscogsPlugin(BeetsPlugin):
# Move articles to the front.
name = re.sub(r'(?i)^(.*?), (a|an|the)$', r'\2 \1', name)
bits.append(name)
if artist['join']:
if artist['join'] and i < len(artists) - 1:
bits.append(artist['join'])
artist = ' '.join(bits).replace(' ,', ',') or None
return artist, artist_id

2
docs/changelog.rst
View file

@ -66,6 +66,8 @@ Fixes:
* :doc:`/plugins/embedart`: Avoid resizing the image multiple times when
embedding into an album. Thanks to :user:`kerobaros`. :bug:`1028`,
:bug:`1036`
* :doc:`/plugins/discogs`: Avoid a situation where a trailing comma could be
appended to some artist names. :bug:`1049`
1.3.8 (September 17, 2014)