Better non MBID set up integration

[mpd-sima.git] / sima / client.py

diff --git a/sima/client.py b/sima/client.py
index 0a7f754bfdb03dfeb47de52bb16647f1e0409714..63c2632c85910bb8582df793953b204e69361146 100644 (file)
--- a/sima/client.py
+++ b/sima/client.py
@@ -163,7 +163,8 @@ class PlayerClient(Player):
                 '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):
@@ -297,7 +298,7 @@ class PlayerClient(Player):
                 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)))