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

Changed findRelease to use the musicbrainzngs library, identical output.

Browse Source 
(old musicbrainz 2 library is deprecated and broken)
This commit is contained in:
Patrick Speiser
2012-05-27 09:14:28 +02:00
parent f4e2d1eba0
commit 214d46493c
1 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
headphones/mb.py
View File

@@ -120,10 +120,10 @@ def findArtist(name, limit=1):
def findRelease(name, limit=1):
with mb_lock:
releaselist = []
limit=25
releaselistngs = []
attempt = 0
releaseResults = None
releaseResultsngs = None
chars = set('!?')
if any((c in chars) for c in name):
@@ -134,31 +134,28 @@ def findRelease(name, limit=1):
while attempt < 5:
try:
releaseResults = q.getReleases(ws.ReleaseFilter(query=name, limit=limit))
releaseResultsngs = musicbrainzngs.search_releases(query=name,limit=limit)['release-list']
break
except WebServiceError, e:
except WebServiceError, e: #need to update exceptions
logger.warn('Attempt to query MusicBrainz for "%s" failed: %s' % (name, str(e)))
attempt += 1
time.sleep(10)
time.sleep(sleepytime)
if not releaseResults:
return False
for result in releaseResults:
releaselist.append({
'uniquename': result.release.artist.name,
'title': result.release.title,
'id': u.extractUuid(result.release.artist.id),
'albumid': u.extractUuid(result.release.id),
'url': result.release.artist.id,
'albumurl': result.release.id,
'score': result.score
})
return releaselist
if not releaseResultsngs:
return False
for result in releaseResultsngs:
releaselistngs.append({
'uniquename': unicode(result['artist-credit'][0]['artist']['name']),
'title': unicode(result['title']),
'id': unicode(result['artist-credit'][0]['artist']['id']),
'albumid': unicode(result['id']),
'url': unicode("http://musicbrainz.org/artist/" + result['artist-credit'][0]['artist']['id']),#probably needs to be changed
'albumurl': unicode("http://musicbrainz.org/release/" + result['id']),#probably needs to be changed
'score': int(result['ext:score'])
})
return releaselistngs
def getArtist(artistid, extrasonly=False):