X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fclient.py;h=8bb5de3192947d706e669651cdd38fb7a1f9d732;hb=93ad5efaffc6e4fd9476513ee16386e21ea4049d;hp=0bfc8826be36ca0027df7b6df3af3598456527f7;hpb=70bf86ca3f65a550436cdc70326cb8601f24e5a6;p=mpd-sima.git diff --git a/sima/client.py b/sima/client.py index 0bfc882..8bb5de3 100644 --- a/sima/client.py +++ b/sima/client.py @@ -36,6 +36,7 @@ except ImportError as err: sexit(1) # local import +from .lib.simastr import SimaStr from .lib.player import Player, blacklist from .lib.track import Track from .lib.meta import Album, Artist @@ -50,6 +51,28 @@ class PlayerCommandError(PlayerError): PlayerUnHandledError = MPDError # pylint: disable=C0103 +def bl_artist(func): + def wrapper(*args, **kwargs): + cls = args[0] + if not args[0].database: + return func(*args, **kwargs) + result = func(*args, **kwargs) + if not result: + return + names = list() + for art in result.names: + if cls.database.get_bl_artist(art, add_not=True): + cls.log.debug('Blacklisted "%s"', art) + continue + names.append(art) + if not names: + return + resp = Artist(name=names.pop(), mbid=result.mbid) + for name in names: + resp.add_alias(name) + return resp + return wrapper + class PlayerClient(Player): """MPD Client @@ -109,11 +132,10 @@ class PlayerClient(Player): """ # TODO: ain't working for "sticker find" and "sticker list" tracks_listing = ["playlistfind", "playlistid", "playlistinfo", - "playlistsearch", "plchanges", "listplaylistinfo", "find", - "search", "sticker find",] + "playlistsearch", "plchanges", "listplaylistinfo", "find", + "search", "sticker find",] track_obj = ['currentsong'] if self._comm in tracks_listing + track_obj: - # pylint: disable=w0142 if isinstance(ans, list): return [Track(**track) for track in ans] elif isinstance(ans, dict): @@ -122,8 +144,8 @@ class PlayerClient(Player): def __skipped_track(self, old_curr): if (self.state == 'stop' - or not hasattr(old_curr, 'id') - or not hasattr(self.current, 'id')): + or not hasattr(old_curr, 'id') + or not hasattr(self.current, 'id')): return False return self.current.id != old_curr.id # pylint: disable=no-member @@ -135,31 +157,91 @@ class PlayerClient(Player): self.log.info('Player: Flushing cache!') else: self.log.info('Player: Initialising cache!') - self._cache = { - 'artists': None, - } - self._cache['artists'] = frozenset(self._client.list('artist')) + self._cache = {'artists': frozenset(), + 'nombid_artists': frozenset(),} + self._cache['artists'] = frozenset(filter(None, self._execute('list', ['artist']))) + if Artist.use_mbid: + self._cache['nombid_artists'] = frozenset(filter(None, self._execute('list', ['artist', 'musicbrainz_artistid', '']))) @blacklist(track=True) - def _find_track(self, artist, title): - #return getattr(self, 'find')('artist', artist, 'title', title) - if title: - return self.find('artist', artist, 'title', title) - return self.find('artist', artist) - def find_track(self, artist, title=None): - tracks = list() - if isinstance(artist, Artist): + tracks = set() + if artist.mbid: + if title: + 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: - tracks.extend(self._find_track(name, title=title)) + if title: + tracks |= set(self.find('artist', name, 'title', title)) + else: + tracks |= set(self.find('artist', name)) + return list(tracks) + + @bl_artist + def search_artist(self, artist): + """ + Search artists based on a fuzzy search in the media library + >>> art = Artist(name='the beatles', mbid=) # mbid optional + >>> bea = player.search_artist(art) + >>> print(bea.names) + >>> ['The Beatles', 'Beatles', 'the beatles'] + + Returns an Artist object + """ + found = False + if artist.mbid: + # look for exact search w/ musicbrainz_artistid + exact_m = self._execute('list', ['artist', 'musicbrainz_artistid', artist.mbid]) + if exact_m: + _ = [artist.add_alias(name) for name in exact_m] + found = True + # then complete with fuzzy search on artist with no musicbrainz_artistid + if artist.mbid: + # we already performed a lookup on artists with mbid set + # search through remaining artists + artists = self._cache.get('nombid_artists') else: - tracks.extend(self._find_track(artist,title=title)) - return tracks + artists = self._cache.get('artists') + match = get_close_matches(artist.name, artists, 50, 0.73) + if not match and not found: + return + if len(match) > 1: + self.log.debug('found close match for "%s": %s', artist, '/'.join(match)) + # Does not perform fuzzy matching on short and single word strings + # Only lowercased comparison + if ' ' not in artist.name and len(artist.name) < 8: + for close_art in match: + # Regular lowered string comparison + if artist.name.lower() == close_art.lower(): + artist.add_alias(close_art) + return artist + else: + return + for fuzz_art in match: + # Regular lowered string comparison + if artist.name.lower() == fuzz_art.lower(): + found = True + artist.add_alias(fuzz_art) + if artist.name != fuzz_art: + self.log.debug('"%s" matches "%s".', fuzz_art, artist) + continue + # SimaStr string __eq__ (not regular string comparison here) + if SimaStr(artist.name) == fuzz_art: + found = True + artist.add_alias(fuzz_art) + self.log.info('"%s" quite probably matches "%s" (SimaStr)', + fuzz_art, artist) + if found: + if artist.aliases: + self.log.debug('Found: %s', '/'.join(list(artist.names)[:4])) + return artist - @blacklist(track=True) def fuzzy_find_track(self, artist, title): # Retrieve all tracks from artist - all_tracks = self.find('artist', artist) + all_tracks = self.find_track(artist, title) # Get all titles (filter missing titles set to 'None') all_artist_titles = frozenset([tr.title for tr in all_tracks if tr.title is not None]) @@ -171,11 +253,11 @@ class PlayerClient(Player): if leven == 1: pass elif leven >= 0.79: # PARAM - self.log.debug('title: "%s" should match "%s" (lr=%1.3f)' % - (title_, title, leven)) + self.log.debug('title: "%s" should match "%s" (lr=%1.3f)', + title_, title, leven) else: - self.log.debug('title: "%s" does not match "%s" (lr=%1.3f)' % - (title_, title, leven)) + self.log.debug('title: "%s" does not match "%s" (lr=%1.3f)', + title_, title, leven) return [] return self.find('artist', artist, 'title', title_) @@ -197,8 +279,9 @@ class PlayerClient(Player): album containing at least a single track for artist """ albums = [] - for name in artist.aliases: - self.log.debug('Searching album for {}'.format(name)) + for name in artist.names: + if len(artist.names) > 1: + self.log.debug('Searching album for aliase: "%s"', name) kwalbart = {'albumartist':name, 'artist':name} for album in self.list('album', 'albumartist', artist): if album and album not in albums: @@ -206,15 +289,15 @@ class PlayerClient(Player): for album in self.list('album', 'artist', artist): album_trks = [trk for trk in self.find('album', album)] if 'Various Artists' in [tr.albumartist for tr in album_trks]: - self.log.debug('Discarding {0} ("Various Artists" set)'.format(album)) + self.log.debug('Discarding %s ("Various Artists" set)', album) continue arts = set([trk.artist for trk in album_trks]) if len(set(arts)) < 2: # TODO: better heuristic, use a ratio instead if album not in albums: - albums.append(Album(name=album, albumartist=artist)) + albums.append(Album(name=album, **kwalbart)) elif album and album not in albums: self.log.debug('"{0}" probably not an album of "{1}"'.format( - album, artist) + '({0})'.format('/'.join(arts))) + album, artist) + '({0})'.format('/'.join(arts))) return albums def monitor(self): @@ -237,7 +320,7 @@ class PlayerClient(Player): if 'idle' in self._client._pending: self._client.noidle() elif self._client._pending: - self.log.warning('pending commands: {}'.format(self._client._pending)) + self.log.warning('pending commands: %s', self._client._pending) def remove(self, position=0): self.delete(position) @@ -245,7 +328,7 @@ class PlayerClient(Player): def add(self, track): """Overriding MPD's add method to accept add signature with a Track object""" - self._client.add(track.file) + self._execute('add', [track.file]) @property def artists(self): @@ -255,6 +338,18 @@ class PlayerClient(Player): def state(self): return str(self.status().get('state')) + @property + def playmode(self): + plm = {'repeat': None, + 'single': None, + 'random': None, + 'consume': None, + } + for key, val in self.status().items(): + if key in plm.keys(): + plm.update({key:bool(int(val))}) + return plm + @property def current(self): return self.currentsong() @@ -294,18 +389,8 @@ class PlayerClient(Player): if password: try: self._client.password(password) - - # Catch errors with the password command (e.g., wrong password) - except CommandError as err: - raise PlayerError("Could not connect to '%s': " - "password command failed: %s" % - (host, err)) - - # Catch all other possible errors except (MPDError, IOError) as err: - raise PlayerError("Could not connect to '%s': " - "error with password command: %s" % - (host, err)) + raise PlayerError("Could not connect to '%s': %s", (host, err)) # Controls we have sufficient rights needed_cmds = ['status', 'stats', 'add', 'find', \ 'search', 'currentsong', 'ping'] @@ -322,8 +407,12 @@ class PlayerClient(Player): if Artist.use_mbid: if 'MUSICBRAINZ_ARTISTID' not in self._client.tagtypes(): self.log.warning('Use of MusicBrainzIdentifier is set but MPD is ' - 'not providing related metadata') + 'not providing related metadata') self.log.info(self._client.tagtypes()) + self.log.warning('Disabling MusicBrainzIdentifier') + Artist.use_mbid = False + else: + self.log.trace('Available metadata: %s', self._client.tagtypes()) # pylint: disable=no-member else: self.log.warning('Use of MusicBrainzIdentifier disabled!') self.log.info('Consider using MusicBrainzIdentifier for your music library')