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

Merge pull request #87 from pscn/master

Browse source 
Use release disambiguation not release-group disambiguation and more
This commit is contained in:
Adrian Sampson 2013-02-02 12:33:03 -08:00
commit 5f5d3f13c5
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beets/autotag/mb.py
View file

@ -188,7 +188,7 @@ def album_info(release):
info.va = info.artist_id == VARIOUS_ARTISTS_ID
info.asin = release.get('asin')
info.releasegroup_id = release['release-group']['id']
info.albumdisambig = release['release-group'].get('disambiguation')
info.albumdisambig = release.get('disambiguation')
info.country = release.get('country')
info.albumstatus = release.get('status')

8
beets/ui/commands.py
View file

@ -384,7 +384,13 @@ def choose_candidate(candidates, singleton, rec, cur_artist=None,
if match.info.year:
disambig.append(unicode(match.info.year))
if match.info.media:
disambig.append(match.info.media)
if match.info.mediums > 1:
disambig.append(u'{0}x{1}'.format(
match.info.mediums, match.info.media))
else:
disambig.append(match.info.media)
if match.info.albumdisambig:
disambig.append(match.info.albumdisambig)
if disambig:
line += u' [{0}]'.format(u', '.join(disambig))

1
test/test_mb.py
View file

@ -23,6 +23,7 @@ class MBAlbumInfoTest(unittest.TestCase):
'title': 'ALBUM TITLE',
'id': 'ALBUM ID',
'asin': 'ALBUM ASIN',
'disambiguation': 'DISAMBIGUATION',
'release-group': {
'type': 'Album',
'first-release-date': date_str,