gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-21 16:34:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'server-update'

Browse Source
This commit is contained in:
rembo10
2012-03-19 14:20:16 +00:00
parent 5bf61a9e9d 2a120aceab
commit be3f853d9b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/mb.py
+10 -10
View File
@@ -69,7 +69,7 @@ def findArtist(name, limit=1):
artistResults = q.getArtists(ws.ArtistFilter(query=name, limit=limit)) artistResults = q.getArtists(ws.ArtistFilter(query=name, limit=limit))
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s failed: %s' % (name, e)) logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
attempt += 1 attempt += 1
time.sleep(10) time.sleep(10)
@@ -129,7 +129,7 @@ def findRelease(name, limit=1):
releaseResults = q.getReleases(ws.ReleaseFilter(query=name, limit=limit)) releaseResults = q.getReleases(ws.ReleaseFilter(query=name, limit=limit))
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s failed: %s' % (name, e)) logger.warn('Attempt to query MusicBrainz for "%s" failed: %s' % (name, str(e)))
attempt += 1 attempt += 1
time.sleep(10) time.sleep(10)
@@ -171,7 +171,7 @@ def getArtist(artistid, extrasonly=False):
artist = q.getArtistById(artistid, inc) artist = q.getArtistById(artistid, inc)
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s. Sleeping 5 seconds: %s' % (artistid, e)) logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s (%s)' % (artistid, str(e)))
attempt += 1 attempt += 1
time.sleep(5) time.sleep(5)
@@ -222,7 +222,7 @@ def getArtist(artistid, extrasonly=False):
artist = q.getArtistById(artistid, inc) artist = q.getArtistById(artistid, inc)
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s. Sleeping 5 seconds' % artistid) logger.warn('Attempt to retrieve artist information from MusicBrainz failed for artistid: %s (%s)' % (artistid, str(e)))
attempt += 1 attempt += 1
time.sleep(5) time.sleep(5)
@@ -262,7 +262,7 @@ def getReleaseGroup(rgid):
releaseGroup = q.getReleaseGroupById(rgid, inc) releaseGroup = q.getReleaseGroupById(rgid, inc)
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to retrieve information from MusicBrainz for release group "%s" failed. Sleeping 5 seconds' % rgid) logger.warn('Attempt to retrieve information from MusicBrainz for release group "%s" failed (%s)' % (rgid, str(e)))
attempt += 1 attempt += 1
time.sleep(5) time.sleep(5)
@@ -284,7 +284,7 @@ def getReleaseGroup(rgid):
releaseResult = q.getReleaseById(release.id, inc) releaseResult = q.getReleaseById(release.id, inc)
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to retrieve release information for %s from MusicBrainz failed: %s. Sleeping 5 seconds' % (releaseResult.title, e)) logger.warn('Attempt to retrieve release information for %s from MusicBrainz failed (%s)' % (releaseResult.title, str(e)))
attempt += 1 attempt += 1
time.sleep(5) time.sleep(5)
@@ -395,7 +395,7 @@ def getRelease(releaseid):
results = q.getReleaseById(releaseid, inc) results = q.getReleaseById(releaseid, inc)
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to retrieve information from MusicBrainz for release "%s" failed: %s. SLeeping 5 seconds' % (releaseid, e)) logger.warn('Attempt to retrieve information from MusicBrainz for release "%s" failed (%s)' % (releaseid, str(e)))
attempt += 1 attempt += 1
time.sleep(5) time.sleep(5)
@@ -467,7 +467,7 @@ def findArtistbyAlbum(name):
results = q.getReleaseGroups(f) results = q.getReleaseGroups(f)
break break
except WebServiceError, e: except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s failed: %s. Sleeping 5 seconds.' % (name, e)) logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
attempt += 1 attempt += 1
time.sleep(10) time.sleep(10)
@@ -501,8 +501,8 @@ def findAlbumID(artist=None, album=None):
try: try:
results = q.getReleaseGroups(f) results = q.getReleaseGroups(f)
break break
except Exception, e: except WebServiceError, e:
logger.warn('Attempt to query MusicBrainz for %s - %s failed: %s. Sleeping 5 seconds.' % (artist, album, e)) logger.warn('Attempt to query MusicBrainz for %s - %s failed (%s)' % (artist, album, str(e)))
attempt += 1 attempt += 1
time.sleep(10) time.sleep(10)