X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=4e6af68f37ec2614b71f3114da9746d56ae85af8;hb=a978d2975c3201dbac0c9e43a08337a800438d2f;hp=338c3cff192af2509f635e1865dc5a4cfa27e6e4;hpb=b36c71a274b677e20147f26ce1dd3c4cc7d94d4e;p=mpd-sima.git

diff --git a/sima/mpdclient.py b/sima/mpdclient.py
index 338c3cf..4e6af68 100644
--- a/sima/mpdclient.py
+++ b/sima/mpdclient.py
@@ -22,7 +22,7 @@ from functools import wraps
 from logging import getLogger
 
 # external module
-from musicpd import MPDClient, MPDError
+from musicpd import MPDClient, MPDError as PlayerError
 
 
 # local import
@@ -32,10 +32,6 @@ from .lib.simastr import SimaStr
 from .utils.leven import levenshtein_ratio
 
 
-class PlayerError(MPDError):
-    """Fatal error in the player."""
-
-
 # Some decorators
 def bl_artist(func):
     def wrapper(*args, **kwargs):
@@ -59,12 +55,15 @@ def set_artist_mbid(func):
         result = func(*args, **kwargs)
         if Meta.use_mbid:
             if result and not result.mbid:
-                result.mbid = cls._find_musicbrainz_artistid(result)
+                mbid = cls._find_musicbrainz_artistid(result)
+                artist = Artist(name=result.name, mbid=mbid)
+                artist.add_alias(result)
+                return artist
         return result
     return wrapper
 
 def tracks_wrapper(func):
-    """Convert plain track mapping as returned by MPDClient into :py:obj:Track
+    """Convert plain track mapping as returned by MPDClient into :py:obj:`sima.lib.track.Track`
     objects. This decorator accepts single track or list of tracks as input.
     """
     @wraps(func)
@@ -81,7 +80,7 @@ class MPD(MPDClient):
     """
     Player instance inheriting from MPDClient (python-musicpd).
 
-    Some methods are overridden to format objects as sima.lib.Track for
+    Some methods are overridden to format objects as :py:obj:`sima.lib.track.Track` for
     instance, other are calling parent class directly through super().
     cf. MPD.__getattr__
 
@@ -136,20 +135,20 @@ class MPD(MPDClient):
         try:
             super().connect(host, port)
         # Catch socket errors
-        except IOError as err:
+        except OSError as err:
             raise PlayerError('Could not connect to "%s:%s": %s' %
                               (host, port, err.strerror))
         # Catch all other possible errors
         # ConnectionError and ProtocolError are always fatal.  Others may not
         # be, but we don't know how to handle them here, so treat them as if
         # they are instead of ignoring them.
-        except MPDError as err:
+        except PlayerError as err:
             raise PlayerError('Could not connect to "%s:%s": %s' %
                               (host, port, err))
         if password:
             try:
                 self.password(password)
-            except (MPDError, IOError) as err:
+            except (PlayerError, OSError) as err:
                 raise PlayerError("Could not connect to '%s': %s" % (host, err))
         # Controls we have sufficient rights
         available_cmd = self.commands()
@@ -229,7 +228,7 @@ class MPD(MPDClient):
         curr = self.current
         try:
             ret = self.idle('database', 'playlist', 'player', 'options')
-        except (MPDError, IOError) as err:
+        except (PlayerError, OSError) as err:
             raise PlayerError("Couldn't init idle: %s" % err)
         if self._skipped_track(curr):
             ret.append('skipped')
@@ -248,7 +247,7 @@ class MPD(MPDClient):
     def add(self, payload):
         """Overriding MPD's add method to accept Track objects
 
-        :param Track,list payload: Either a single :py:obj:`Track` or a list of it
+        :param Track,list payload: Either a single track or a list of it
         """
         if isinstance(payload, Track):
             super().__getattr__('add')(payload.file)
@@ -300,8 +299,8 @@ class MPD(MPDClient):
             >>> player.find_tracks(Album('In Utero', artist=Artist('Nirvana'))
 
         :param Artist,Album what: Artist or Album to fetch track from
-
-        Returns a list of :py:obj:Track objects
+        :return: A list of track objects
+        :rtype: list(Track)
         """
         if isinstance(what, Artist):
             return self._find_art(what)
@@ -362,14 +361,15 @@ class MPD(MPDClient):
 # #### Search Methods #####
     def _find_musicbrainz_artistid(self, artist):
         """Find MusicBrainzArtistID when possible.
-        For artist with aliases having a mbid but not the main name, no mbid is
-        fetched…
-        Searching for Artist('Russian Circls') do not reslove the MBID
         """
         if not self.use_mbid:
             return None
-        mbids = self.list('MUSICBRAINZ_ARTISTID',
-                          f'(artist == "{artist.name_sz}")')
+        mbids = None
+        for name in artist.names_sz:
+            filt = f'((artist == "{name}") AND (MUSICBRAINZ_ARTISTID != ""))'
+            mbids = self.list('MUSICBRAINZ_ARTISTID', filt)
+            if mbids:
+                break
         if not mbids:
             return None
         if len(mbids) > 1:
@@ -393,8 +393,8 @@ class MPD(MPDClient):
             >>> ['The Beatles', 'Beatles', 'the beatles']
 
         :param Artist artist: Artist to look for in MPD music library
-
-        Returns an Artist object
+        :return: Artist object
+        :rtype: Artist
         """
         found = False
         if artist.mbid: