'nombid_artists': None,
}
self._cache['artists'] = frozenset(self._client.list('artist'))
- self._cache['nombid_artists'] = frozenset(self._client.list('artist', 'musicbrainz_artistid', ''))
+ if Artist.use_mbid:
+ self._cache['nombid_artists'] = frozenset(self._client.list('artist', 'musicbrainz_artistid', ''))
@blacklist(track=True)
def find_track(self, artist, title=None):
found = False
if artist.mbid:
# look for exact search w/ musicbrainz_artistid
- [artist.add_alias(name) for name in
- self._client.list('artist', 'musicbrainz_artistid', artist.mbid)]
- if artist.aliases:
+ exact_m = self._client.list('artist', 'musicbrainz_artistid', artist.mbid)
+ if exact_m:
+ [artist.add_alias(name) for name in exact_m]
found = True
else:
artist = Artist(name=artist.name)
# then complete with fuzzy search on artist with no musicbrainz_artistid
- nombid_artists = self._cache.get('nombid_artists', [])
- match = get_close_matches(artist.name, nombid_artists, 50, 0.73)
+ if artist.mbid:
+ # we already performed a lookup on artists with mbid set
+ # search through remaining artists
+ artists = self._cache.get('nombid_artists', [])
+ else:
+ artists = self._cache.get('artists', [])
+ match = get_close_matches(artist.name, artists, 50, 0.73)
if not match and not found:
return
if len(match) > 1:
arts = set([trk.artist for trk in album_trks])
if len(set(arts)) < 2: # TODO: better heuristic, use a ratio instead
if album not in albums:
- albums.append(Album(name=album, albumartist=artist))
+ albums.append(Album(name=album, **kwalbart))
elif album and album not in albums:
self.log.debug('"{0}" probably not an album of "{1}"'.format(
album, artist) + '({0})'.format('/'.join(arts)))