X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=3bd13aef7b4b3705c092f086c034723d1b364680;hb=48e9d961a1dce5739ad59301b179a3bd0cc02754;hp=92ca0ceee21e1ec92a3d1450652047a8da3b4eec;hpb=12d710d35febb030442322df99d851ad2da29704;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index 92ca0ce..3bd13ae 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -20,6 +20,7 @@ from difflib import get_close_matches from functools import wraps from logging import getLogger +from select import select # external module from musicpd import MPDClient, MPDError @@ -30,9 +31,10 @@ from .lib.meta import Meta, Artist, Album from .lib.track import Track from .lib.simastr import SimaStr from .utils.leven import levenshtein_ratio +from .utils.utils import MPDSimaException -class PlayerError(Exception): +class PlayerError(MPDSimaException): """Fatal error in the player.""" @@ -42,23 +44,34 @@ def bl_artist(func): 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) @@ -75,7 +88,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__ @@ -101,6 +114,7 @@ class MPD(MPDClient): def __init__(self, config): super().__init__() + self.socket_timeout = 10 self.use_mbid = True self.log = getLogger('sima') self.config = config @@ -110,9 +124,14 @@ class MPD(MPDClient): def __getattr__(self, cmd): """Wrapper around MPDClient calls for abstract overriding""" track_wrapped = {'currentsong', 'find', 'playlistinfo', } - if cmd in track_wrapped: - return tracks_wrapper(super().__getattr__(cmd)) - return super().__getattr__(cmd) + try: + if cmd in track_wrapped: + return tracks_wrapper(super().__getattr__(cmd)) + return super().__getattr__(cmd) + except OSError as err: # socket errors + raise PlayerError(err) from err + except MPDError as err: # hight level MPD client errors + raise PlayerError(err) from err def disconnect(self): """Overriding explicitly MPDClient.disconnect()""" @@ -130,51 +149,48 @@ class MPD(MPDClient): try: super().connect(host, port) # Catch socket errors - except IOError as err: - raise PlayerError('Could not connect to "%s:%s": %s' % - (host, port, err.strerror)) + except OSError as err: + raise PlayerError(f'Could not connect to "{host}:{port}": {err.strerror}' + ) from err # 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: - raise PlayerError('Could not connect to "%s:%s": %s' % - (host, port, err)) + raise PlayerError(f'Could not connect to "{host}:{port}": {err}') from err if password: try: self.password(password) - except (MPDError, IOError) as err: - raise PlayerError("Could not connect to '%s': %s" % (host, err)) + except (MPDError, OSError) as err: + raise PlayerError(f"Could not connect to '{host}': {err}") from err # Controls we have sufficient rights available_cmd = self.commands() for cmd in MPD.needed_cmds: if cmd not in available_cmd: self.disconnect() - raise PlayerError('Could connect to "%s", ' - 'but command "%s" not available' % - (host, cmd)) + raise PlayerError(f'Could connect to "{host}", but command "{cmd}" not available') self.tagtypes('clear') for tag in MPD.needed_tags: self.tagtypes('enable', tag) - tt = set(map(str.lower, self.tagtypes())) + ltt = set(map(str.lower, self.tagtypes())) needed_tags = set(map(str.lower, MPD.needed_tags)) - if len(needed_tags & tt) != len(MPD.needed_tags): - self.log.warning('MPD exposes: %s', tt) + if len(needed_tags & ltt) != len(MPD.needed_tags): + self.log.warning('MPD exposes: %s', ltt) self.log.warning('Tags needed: %s', needed_tags) raise PlayerError('Missing mandatory metadata!') for tag in MPD.needed_mbid_tags: self.tagtypes('enable', tag) # Controls use of MusicBrainzIdentifier if self.config.getboolean('sima', 'musicbrainzid'): - tt = set(self.tagtypes()) - if len(MPD.needed_mbid_tags & tt) != len(MPD.needed_mbid_tags): + ltt = set(self.tagtypes()) + if len(MPD.needed_mbid_tags & ltt) != len(MPD.needed_mbid_tags): self.log.warning('Use of MusicBrainzIdentifier is set but MPD ' 'is not providing related metadata') - self.log.info(tt) + self.log.info(ltt) self.log.warning('Disabling MusicBrainzIdentifier') self.use_mbid = Meta.use_mbid = False else: - self.log.debug('Available metadata: %s', tt) + self.log.debug('Available metadata: %s', ltt) self.use_mbid = Meta.use_mbid = True else: self.log.warning('Use of MusicBrainzIdentifier disabled!') @@ -221,15 +237,22 @@ class MPD(MPDClient): * skipped current track skipped """ curr = self.current - try: - ret = self.idle('database', 'playlist', 'player', 'options') - except (MPDError, IOError) as err: - raise PlayerError("Couldn't init idle: %s" % err) - if self._skipped_track(curr): - ret.append('skipped') - if 'database' in ret: - self._reset_cache() - return ret + select_timeout = 5 + while True: + self.send_idle('database', 'playlist', 'player', 'options') + _read, _, _ = select([self], [], [], select_timeout) + if _read: # tries to read response + ret = self.fetch_idle() + if self._skipped_track(curr): + ret.append('skipped') + if 'database' in ret: + self._reset_cache() + return ret + # Nothing to read, canceling idle + try: # noidle cmd does not go through __getattr__, need to catch OSError then + self.noidle() + except OSError as err: + raise PlayerError(err) from err def clean(self): """Clean blocking event (idle) and pending commands @@ -242,7 +265,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) @@ -270,7 +293,7 @@ class MPD(MPDClient): plm = {'repeat': None, 'single': None, 'random': None, 'consume': None, } for key, val in self.status().items(): - if key in plm.keys(): + if key in plm: plm.update({key: bool(int(val))}) return plm @@ -294,8 +317,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) @@ -316,7 +339,7 @@ class MPD(MPDClient): 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')} @@ -355,10 +378,16 @@ class MPD(MPDClient): # #### 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: @@ -370,8 +399,10 @@ class MPD(MPDClient): artist.name, mbids[0], artist.mbid) else: return mbids[0] + return None @bl_artist + @set_artist_mbid def search_artist(self, artist): """ Search artists based on a fuzzy search in the media library @@ -381,8 +412,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: @@ -527,9 +558,9 @@ class MPD(MPDClient): if artist.mbid == album_trks[0].musicbrainz_albumartistid: candidates.append(album) continue - else: - self.log.debug('Discarding "%s", "%r" not set as musicbrainz_albumartistid', album, album.Artist) - continue + self.log.debug('Discarding "%s", "%r" not set as musicbrainz_albumartistid', + album, album.Artist) + continue if 'Various Artists' in album_artists: self.log.debug('Discarding %s ("Various Artists" set)', album) continue