Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-15 21:14:19 +01:00
Code Issues Projects Releases Wiki Activity

Display clear error message when MusicBrainz is unreachable: "MusicBrainz not reachable"

Browse source 
Catch musicbrainzngs.WebServiceError before the general musicbrainzngs.MusicBrainzError
Fix #1190
This commit is contained in:
Tom Jaspers 2015-01-26 14:25:32 +01:00
parent f2ed7b2373
commit 67e1065229
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
beets/autotag/mb.py
View file

@ -325,6 +325,11 @@ def match_album(artist, album, tracks=None):
try:
res = musicbrainzngs.search_releases(
limit=config['musicbrainz']['searchlimit'].get(int), **criteria)
except musicbrainzngs.WebServiceError:
log.debug(u'MusicBrainz is unreachable.')
raise MusicBrainzAPIError('MusicBrainz not reachable',
'release search', criteria,
traceback.format_exc())
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(exc, 'release search', criteria,
traceback.format_exc())
@ -351,6 +356,11 @@ def match_track(artist, title):
try:
res = musicbrainzngs.search_recordings(
limit=config['musicbrainz']['searchlimit'].get(int), **criteria)
except musicbrainzngs.WebServiceError:
log.debug(u'MusicBrainz is unreachable.')
raise MusicBrainzAPIError('MusicBrainz not reachable',
'recording search', criteria,
traceback.format_exc())
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(exc, 'recording search', criteria,
traceback.format_exc())
@ -383,6 +393,11 @@ def album_for_id(releaseid):
except musicbrainzngs.ResponseError:
log.debug(u'Album ID match failed.')
return None
except musicbrainzngs.WebServiceError:
log.debug(u'MusicBrainz is unreachable.')
raise MusicBrainzAPIError('MusicBrainz not reachable',
'get release by ID', albumid,
traceback.format_exc())
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(exc, 'get release by ID', albumid,
traceback.format_exc())
@ -402,6 +417,11 @@ def track_for_id(releaseid):
except musicbrainzngs.ResponseError:
log.debug(u'Track ID match failed.')
return None
except musicbrainzngs.WebServiceError:
log.debug(u'MusicBrainz is unreachable.')
raise MusicBrainzAPIError('MusicBrainz not reachable',
'get recording by ID', trackid,
traceback.format_exc())
except musicbrainzngs.MusicBrainzError as exc:
raise MusicBrainzAPIError(exc, 'get recording by ID', trackid,
traceback.format_exc())