gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-02 09:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed findArtistbyAlbum to use the musicbrainzngs library, compatible but NOT identical output. differences seem to be restricted to the uniquename entry in the artist_dict)

Browse Source
This commit is contained in:
Patrick Speiser
2012-05-28 15:11:24 +02:00
parent a8183ee4dc
commit 0f0fffbb9f
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
headphones/mb.py
View File

@@ -463,39 +463,42 @@ def findArtistbyAlbum(name):
# Probably not neccessary but just want to double check # Probably not neccessary but just want to double check
if not artist['AlbumTitle']: if not artist['AlbumTitle']:
return False return False
term = '"'+artist['AlbumTitle']+'" AND artist:"'+name+'"' term = '"'+artist['AlbumTitle']+'" AND artist:"'+name+'"'
f = ws.ReleaseGroupFilter(query=term, limit=1)
results = None results = None
attempt = 0 attempt = 0
q, sleepytime = startmb(forcemb=True) q, sleepytime = startmb(forcemb=True)
while attempt < 5: while attempt < 5:
try: try:
results = q.getReleaseGroups(f) results = musicbrainzngs.search_release_groups(term).get('release-group-list')
break break
except WebServiceError, e: except WebServiceError, e: #update exceptions
logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e))) logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
attempt += 1 attempt += 1
time.sleep(10) time.sleep(10)
time.sleep(sleepytime) time.sleep(sleepytime)
if not results: if not results:
return False return False
artist_dict = {} artist_dict = {}
for releaseGroup in results:
newArtist = releaseGroup['artist-credit'][0]['artist']
if 'disambiguation' in newArtist:
uniquename = unicode(newArtist['sort-name'] + " (" + newArtist['disambiguation'] + ")")
else:
uniquename = unicode(newArtist['sort-name'])
artist_dict['name'] = unicode(newArtist['sort-name'])
artist_dict['uniquename'] = uniquename
artist_dict['id'] = unicode(newArtist['id'])
artist_dict['url'] = u'http://musicbrainz.org/artist/' + newArtist['id']
artist_dict['score'] = int(releaseGroup['ext:score'])
for result in results:
releaseGroup = result.releaseGroup
artist_dict['name'] = releaseGroup.artist.name
artist_dict['uniquename'] = releaseGroup.artist.getUniqueName()
artist_dict['id'] = u.extractUuid(releaseGroup.artist.id)
artist_dict['url'] = releaseGroup.artist.id
artist_dict['score'] = result.score
return artist_dict return artist_dict