X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=cced48c34e4df1f77ba1c962b4520246c6e43d5f;hb=799caf7d8e01cf9a10857bda5738fe98afd3902e;hp=d528b96bb25aa4dff2260e3475cf380ce050ac1a;hpb=bea8556448ebaf7f54ebd268639caa7492dd0a85;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index d528b96..cced48c 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -50,6 +50,7 @@ def bl_artist(func): return result return wrapper + def set_artist_mbid(func): def wrapper(*args, **kwargs): cls = args[0] @@ -63,6 +64,7 @@ def set_artist_mbid(func): return result return wrapper + def tracks_wrapper(func): """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. @@ -121,8 +123,8 @@ class MPD(MPDClient): if cmd in track_wrapped: return tracks_wrapper(super().__getattr__(cmd)) return super().__getattr__(cmd) - except OSError as err: - raise PlayerError(err) + except OSError as err: # socket errors + raise PlayerError(err) from err def disconnect(self): """Overriding explicitly MPDClient.disconnect()""" @@ -141,56 +143,59 @@ class MPD(MPDClient): super().connect(host, port) # Catch socket errors except OSError as err: - raise PlayerError('Could not connect to "%s:%s": %s' % - (host, port, err.strerror)) + 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 PlayerError 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 (PlayerError, OSError) as err: - raise PlayerError("Could not connect to '%s': %s" % (host, err)) + except 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)) - self.tagtypes('clear') + 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())) + self.tagtypes_enable(tag) + 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) + 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!') self.log.info('Consider using MusicBrainzIdentifier for your music library') self.use_mbid = Meta.use_mbid = False - self._reset_cache() + # TODO: Why do I need to intercept OSError here? + # why is it not wrapped in PlayerError in __getattr__? + # (cf. commit message for more) + try: + self._reset_cache() + except OSError as err: + raise PlayerError(f'Error during cache init: {err}') from err # ######### / Overriding MPDClient ######### def _reset_cache(self): @@ -232,21 +237,21 @@ class MPD(MPDClient): """ curr = self.current 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 - else: - try: # noidle cmd does not go through __getattr__, need to catch OSError then - self.noidle() - except OSError as err: - raise PlayerError(err) + try: # noidle cmd does not go through __getattr__, need to catch OSError then + 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 + self.noidle() + except OSError as err: + raise PlayerError(err) from err def clean(self): """Clean blocking event (idle) and pending commands @@ -287,7 +292,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 @@ -393,6 +398,7 @@ class MPD(MPDClient): artist.name, mbids[0], artist.mbid) else: return mbids[0] + return None @bl_artist @set_artist_mbid @@ -422,12 +428,6 @@ class MPD(MPDClient): if SimaStr(artist.name) == name and name != artist.name: self.log.debug('add alias for %s: %s', artist, name) artist.add_alias(name) - elif len(library) == 1 and library[0] != artist.name: - new_alias = artist.name - self.log.info('Update artist name %s->%s', artist, library[0]) - self.log.debug('Also add alias for %s: %s', artist, new_alias) - artist = Artist(name=library[0], mbid=artist.mbid) - artist.add_alias(new_alias) # Fetches remaining artists for potential match artists = self._cache['nombid_artists'] else: # not using MusicBrainzIDs @@ -551,9 +551,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