from logging import getLogger
# external module
-from musicpd import MPDClient, MPDError
+from musicpd import MPDClient, MPDError as PlayerError
# local import
from .utils.leven import levenshtein_ratio
-class PlayerError(Exception):
- """Fatal error in the player."""
-
-
# Some decorators
def bl_artist(func):
def wrapper(*args, **kwargs):
cls = args[0]
if not cls.database:
return func(*args, **kwargs)
- results = func(*args, **kwargs)
- if not results:
+ result = func(*args, **kwargs)
+ if not result:
return None
- for art in results.names:
- mbid = results.mbid
- if not mbid:
- mbid = cls._find_musicbrainz_artistid(results)
- artist = Artist(name=art, mbid=mbid)
+ for art in result.names:
+ artist = Artist(name=art, mbid=result.mbid)
if cls.database.get_bl_artist(artist, add=False):
cls.log.debug('Artist in blocklist: %s', artist)
return None
- return results
+ return result
return wrapper
+def set_artist_mbid(func):
+ def wrapper(*args, **kwargs):
+ cls = args[0]
+ result = func(*args, **kwargs)
+ if Meta.use_mbid:
+ if result and not result.mbid:
+ 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)
"""
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__
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()
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')
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)
>>> 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)
for name in artist.names:
tracks |= set(self.find('artist', name))
# album blocklist
- albums = {Album(trk.album, mbid=trk.musicbrainz_albumid)
+ albums = {Album(trk.Album.name, mbid=trk.musicbrainz_albumid)
for trk in tracks}
bl_albums = {Album(a.get('album'), mbid=a.get('musicbrainz_album'))
for a in self.database.view_bl() if a.get('album')}
# #### Search Methods #####
def _find_musicbrainz_artistid(self, artist):
+ """Find MusicBrainzArtistID when possible.
+ """
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:
return mbids[0]
@bl_artist
+ @set_artist_mbid
def search_artist(self, artist):
"""
Search artists based on a fuzzy search in the media library
>>> ['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:
home / dev / repositories / mpd-sima.git / blobdiff