X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=0784fa6935c28d5d9490f77c6e62ea8bb2476990;hb=707eac72ccee340ed229aa214a986caccb38f363;hp=82c6dbb505e2fc40a008fb2b2b87024497733834;hpb=5f1dd8bdf50cd25c049e5c20742be87b461e6385;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index 82c6dbb..0784fa6 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -205,7 +205,8 @@ class MPD(MPDClient): 'nombid_artists': frozenset()} self._cache['artists'] = frozenset(filter(None, self.list('artist'))) if Artist.use_mbid: - self._cache['nombid_artists'] = frozenset(filter(None, self.list('artist', 'musicbrainz_artistid', ''))) + artists = self.list('artist', "(MUSICBRAINZ_ARTISTID == '')") + self._cache['nombid_artists'] = frozenset(filter(None, artists)) def _skipped_track(self, previous): if (self.state == 'stop' @@ -233,7 +234,7 @@ class MPD(MPDClient): if self._skipped_track(curr): ret.append('skipped') if 'database' in ret: - self._flush_cache() + self._reset_cache() return ret def clean(self): @@ -249,8 +250,10 @@ class MPD(MPDClient): if isinstance(payload, Track): super().__getattr__('add')(payload.file) elif isinstance(payload, list): + self.command_list_ok_begin() for tr in payload: # TODO: use send command here self.add(tr) + results = client.command_list_end() else: self.log.error('Cannot add %s', payload) @@ -289,14 +292,6 @@ class MPD(MPDClient): # ######### / Properties ################### # #### find_tracks #### - def find_album(self, artist, album_name): - self.log.warning('update call to find_album→find_tracks()') - return self.find_tracks(Album(name=album_name, artist=artist)) - - def find_track(self, *args, **kwargs): - self.log.warning('update call to find_track→find_tracks') - return self.find_tracks(*args, **kwargs) - def find_tracks(self, what): """Find tracks for a specific artist or album >>> player.find_tracks(Artist('Nirvana')) @@ -315,29 +310,27 @@ class MPD(MPDClient): def _find_art(self, artist): tracks = set() - if self.use_mbid and artist.mbid: + if artist.mbid: tracks |= set(self.find('musicbrainz_artistid', artist.mbid)) for name in artist.names: tracks |= set(self.find('artist', name)) return list(tracks) def _find_alb(self, album): - if album.mbid and self.use_mbid: + if not hasattr(album, 'artist'): + PlayerError('Album object have no artist attribute') + albums = [] + if self.use_mbid and album.mbid: filt = f'(MUSICBRAINZ_ALBUMID == {album.mbid})' - return self.find(filt) + albums = self.find(filt) # Now look for album with no MusicBrainzIdentifier - if album.artist.mbid and self.use_mbid: # Use album artist MBID if possible - filt = f"((MUSICBRAINZ_ALBUMARTISTID == '{album.artist.mbid}') AND (album == '{album!s}'))" - return self.find(filt) - tracks = [] - # Falls back to albumartist/album name - filt = f"((albumartist == '{album.artist!s}') AND (album == '{album!s}'))" - tracks = self.find(filt) - # Falls back to artist/album name - if not tracks: - filt = f"((artist == '{album.artist!s}') AND (album == '{album!s}'))" - tracks = self.find(filt) - return tracks + if not albums and album.artist.mbid and self.use_mbid: # Use album artist MBID if possible + filt = f"((MUSICBRAINZ_ARTISTID == '{album.artist.mbid}') AND (album == '{album!s}'))" + albums = self.find(filt) + if not albums: # Falls back to (album)?artist/album name + filt = f"((albumartist == '{album.artist!s}') AND (album == '{album!s}'))" + albums = self.find(filt) + return albums # #### / find_tracks ## # #### Search Methods ##### @@ -350,56 +343,54 @@ class MPD(MPDClient): >>> print(bea.names) >>> ['The Beatles', 'Beatles', 'the beatles'] + :param Artist artist: Artist to look for in MPD music library + Returns an Artist object - TODO: Re-use find method here!!! """ found = False - if artist.mbid: + if self.use_mbid and artist.mbid: # look for exact search w/ musicbrainz_artistid - exact_m = self.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: - artists = self._cache.get('artists') + found = bool(self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')")) + if found: + self.log.trace('Found mbid "%r" in library', artist) + # Fetches remaining artists for potential match + artists = self._cache['nombid_artists'] + else: # not using MusicBrainzIDs + artists = self._cache['artists'] match = get_close_matches(artist.name, artists, 50, 0.73) if not match and not found: return None if len(match) > 1: self.log.debug('found close match for "%s": %s', artist, '/'.join(match)) + # Forst lowercased comparison + for close_art in match: + # Regular lowered string comparison + if artist.name.lower() == close_art.lower(): + artist.add_alias(close_art) + found = True + if artist.name != close_art: + self.log.debug('"%s" matches "%s".', close_art, artist) # 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 None - 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) + self.log.trace('no fuzzy matching for %r', artist) + if found: + return artist + # Now perform fuzzy search + for fuzz in match: + if fuzz in artist.names: # Already found in lower cased comparison continue # SimaStr string __eq__ (not regular string comparison here) - if SimaStr(artist.name) == fuzz_art: + if SimaStr(artist.name) == fuzz: found = True - artist.add_alias(fuzz_art) + artist.add_alias(fuzz) self.log.info('"%s" quite probably matches "%s" (SimaStr)', - fuzz_art, artist) + fuzz, artist) if found: if artist.aliases: self.log.debug('Found: %s', '/'.join(list(artist.names)[:4])) return artist + return None @blacklist(track=True) def search_track(self, artist, title): @@ -442,21 +433,25 @@ class MPD(MPDClient): if artist.aliases: self.log.debug('Searching album for aliase: "%s"', name) kwalbart = {'albumartist': name, 'artist': name} - for album in self.list('album', 'albumartist', name): - if album and album not in albums: - albums.append(Album(name=album, **kwalbart)) - for album in self.list('album', 'artist', name): - album_trks = [trk for trk in self.find('album', album)] + # MPD falls back to artist if albumartist is not available + for album in self.list('album', f"( albumartist == '{name}')"): + if not album: # list can return "" as an album + continue + album_trks = self.find_tracks(Album(name=album, artist=Artist(name=name))) + album_artists = [tr.albumartist for tr in album_trks if tr.albumartist] if 'Various Artists' in [tr.albumartist for tr in album_trks]: self.log.debug('Discarding %s ("Various Artists" set)', album) continue + if name not in album_artists: + self.log.debug('Discarding "%s", "%s" not set as albumartist', album, name) + continue arts = {trk.artist for trk in album_trks} # Avoid selecting album where artist is credited for a single # track of the album if len(set(arts)) < 2: # TODO: better heuristic, use a ratio instead if album not in albums: albums.append(Album(name=album, **kwalbart)) - elif album and album not in albums: + elif album not in albums: self.log.debug('"{0}" probably not an album of "{1}"'.format( album, artist) + '({0})'.format('/'.join(arts))) return albums