Improved client's find_track method with mbids

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

diff --git a/sima/client.py b/sima/client.py
index 66894a77a3516faeb3918a76a9943e4451d76825..499250fccd2d04c01ad96fab717a9b5a79b6c13d 100644 (file)
--- a/sima/client.py
+++ b/sima/client.py
@@ -169,17 +169,18 @@ class PlayerClient(Player):
     @blacklist(track=True)
     def find_track(self, artist, title=None):
         tracks = set()
-        for name in artist.names:
-            if title:
-                tracks |= set(self.find('artist', name, 'title', title))
-            else:
-                tracks |= set(self.find('artist', name))
         if artist.mbid:
             if title:
-                tracks |= set(self.find('musicbrainz_artistid', artist.mbid))
-            else:
                 tracks |= set(self.find('musicbrainz_artistid', artist.mbid,
                                         'title', title))
+            else:
+                tracks |= set(self.find('musicbrainz_artistid', artist.mbid))
+        else:
+            for name in artist.names:
+                if title:
+                    tracks |= set(self.find('artist', name, 'title', title))
+                else:
+                    tracks |= set(self.find('artist', name))
         return list(tracks)
 
     @bl_artist