Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-14 19:35:43 +01:00
Code Issues Projects Releases Wiki Activity

Remove ArtistNotFoundException in favor of returning None for simplicity

Browse source
This commit is contained in:
Marc Addeo 2014-12-29 11:10:43 -05:00
parent e71c464c14
commit 8cd3d0059f
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
beetsplug/ftintitle.py
View file

@ -24,14 +24,6 @@ import re
log = logging.getLogger('beets')
class ArtistNotFoundException(Exception):
def __init__(self, value):
self.value = value
def __str__(self):
return repr(self.value)
def split_on_feat(artist):
"""Given an artist string, split the "main" artist from any artist
on the right-hand side of a string like "feat". Return the main
@ -85,7 +77,7 @@ def find_feat_part(artist, albumartist):
# present, give up.
albumartist_split = artist.split(albumartist, 1)
if len(albumartist_split) <= 1:
raise ArtistNotFoundException('album artist not present in artist')
return feat_part
# If the last element of the split (the right-hand side of the
# album artist) is nonempty, then it probably contains the
@ -121,10 +113,7 @@ def ft_in_title(item, drop_feat, loglevel=logging.DEBUG):
feat_part = None
# Attempt to find the featured artist
try:
feat_part = find_feat_part(artist, albumartist)
except ArtistNotFoundException:
log.log(loglevel, 'album artist not present in artist')
feat_part = find_feat_part(artist, albumartist)
# If we have a featuring artist, move it to the title.
if feat_part: