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

Centralize check and string literal into MusicBrainzAPIError.__init__ for #1190

Browse source
This commit is contained in:
Tom Jaspers 2015-01-26 22:19:02 +01:00
parent 67e1065229
commit e7f3987b42
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
beets/autotag/mb.py
View file

@ -38,6 +38,8 @@ class MusicBrainzAPIError(util.HumanReadableException):
"""
def __init__(self, reason, verb, query, tb=None):
self.query = query
if isinstance(reason, musicbrainzngs.WebServiceError):
reason = 'MusicBrainz not reachable'
super(MusicBrainzAPIError, self).__init__(reason, verb, tb)
def get_message(self):
@ -325,11 +327,6 @@ 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())
@ -356,11 +353,6 @@ 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())
@ -393,11 +385,6 @@ 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())
@ -417,11 +404,6 @@ 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())