X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=97be9dabf0c3dddbb1e4e9bf8b743896b37c6cb1;hb=54849baefbe39c4c0a09bd8ad27bde7743dac5ef;hp=82c6dbb505e2fc40a008fb2b2b87024497733834;hpb=5f1dd8bdf50cd25c049e5c20742be87b461e6385;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index 82c6dbb..97be9da 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -26,7 +26,7 @@ from musicpd import MPDClient, MPDError # local import -from .lib.meta import Artist, Album +from .lib.meta import Meta, Artist, Album from .lib.track import Track from .lib.simastr import SimaStr from .utils.leven import levenshtein_ratio @@ -92,7 +92,7 @@ def blacklist(artist=False, album=False, track=False): if track and cls.database.get_bl_album(elem, add_not=True): # filter album as well in track mode # (artist have already been) - cls.log.debug('Blacklisted alb. "{0.album}"'.format(elem)) + cls.log.debug('Blacklisted alb. "%s"', elem) continue results.append(elem) return results @@ -115,6 +115,10 @@ class MPD(MPDClient): """ needed_cmds = ['status', 'stats', 'add', 'find', 'search', 'currentsong', 'ping'] + needed_mbid_tags = {'Artist', 'Album', 'AlbumArtist', + 'Title', 'Track', 'Genre', + 'MUSICBRAINZ_ARTISTID', 'MUSICBRAINZ_ALBUMID', + 'MUSICBRAINZ_ALBUMARTISTID', 'MUSICBRAINZ_TRACKID'} database = None def __init__(self, daemon): @@ -176,20 +180,24 @@ class MPD(MPDClient): 'but command "%s" not available' % (host, cmd)) # Controls use of MusicBrainzIdentifier - # TODO: Use config instead of Artist object attibute? - if self.use_mbid: - tt = self.tagtypes() - if 'MUSICBRAINZ_ARTISTID' not in tt: - self.log.warning('Use of MusicBrainzIdentifier is set but MPD is ' - 'not providing related metadata') + self.tagtypes('clear') + for tag in MPD.needed_mbid_tags: + self.tagtypes('enable', tag) + if self.daemon.config.get('sima', 'musicbrainzid'): + tt = set(self.tagtypes()) + if len(MPD.needed_mbid_tags & tt) != 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.warning('Disabling MusicBrainzIdentifier') - self.use_mbid = False + self.use_mbid = Meta.use_mbid = False else: - self.log.debug('Available metadata: %s', tt) # pylint: disable=no-member + self.log.debug('Available metadata: %s', tt) + 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() # ######### / Overriding MPDClient ######### @@ -205,7 +213,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 +242,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 +258,10 @@ class MPD(MPDClient): if isinstance(payload, Track): super().__getattr__('add')(payload.file) elif isinstance(payload, list): - for tr in payload: # TODO: use send command here + self.command_list_ok_begin() + for tr in payload: self.add(tr) + self.command_list_end() else: self.log.error('Cannot add %s', payload) @@ -289,14 +300,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 +318,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: + for name in artist.names_sz: 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'): + raise 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_ALBUMARTISTID == '{album.artist.mbid}') AND (album == '{album.name_sz}'))" + albums = self.find(filt) + if not albums: # Falls back to (album)?artist/album name + filt = f"((albumartist == '{album.artist!s}') AND (album == '{album.name_sz}'))" + albums = self.find(filt) + return albums # #### / find_tracks ## # #### Search Methods ##### @@ -350,56 +351,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])) + self.log.debug('Found aliases: %s', '/'.join(artist.names)) return artist + return None @blacklist(track=True) def search_track(self, artist, title): @@ -428,38 +427,49 @@ class MPD(MPDClient): @blacklist(album=True) def search_albums(self, artist): - """ - Fetch all albums for "AlbumArtist" == artist - Then look for albums for "artist" == artist and try to filters - multi-artists albums + """Find potential albums for "artist" - NB: Running "client.list('album', 'artist', name)" MPD returns any album - containing at least a track with "artist" == name - TODO: Use MusicBrainzID here cf. #30 @gitlab + * Fetch all albums for "AlbumArtist" == artist + → falls back to "Artist" == artist when no "AlbumArtist" tag is set + * Tries to filter some mutli-artists album + For instance an album by Artist_A may have a track by Artist_B. Then + looking for albums for Artist_B returns wrongly this album. """ - albums = [] - for name in artist.names: - 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)] - if 'Various Artists' in [tr.albumartist for tr in album_trks]: - self.log.debug('Discarding %s ("Various Artists" set)', album) - 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: - self.log.debug('"{0}" probably not an album of "{1}"'.format( - album, artist) + '({0})'.format('/'.join(arts))) - return albums + # First, look for all potential albums + self.log.debug('Searching album for "%s"', artist) + if artist.aliases: + self.log.debug('Searching album for %s aliases: "%s"', + artist, artist.aliases) + for name_sz in artist.names_sz: + raw_albums = self.list('album', f"( albumartist == '{name_sz}')") + albums = [Album(a, albumartist=artist.name, artist=artist) for a in raw_albums if a] + candidates = [] + for album in albums: + album_trks = self.find_tracks(album) + album_artists = {tr.albumartist for tr in album_trks if tr.albumartist} + if album.artist.names & album_artists: + candidates.append(album) + continue + if 'Various Artists' in album_artists: + self.log.debug('Discarding %s ("Various Artists" set)', album) + continue + if album_artists and album.artist.name not in album_artists: + self.log.debug('Discarding "%s", "%s" not set as albumartist', album, album.artist) + continue + # Attempt to detect false positive + # Avoid selecting albums where artist is credited for a single + # track of the album + album_trks = self.find(f"(album == '{album.name_sz}')") + arts = [trk.artist for trk in album_trks] # Artists in the album + # count artist occurences + ratio = arts.count(album.artist.name)/len(arts) + if ratio >= 0.8: + candidates.append(album) + else: + self.log.debug('"%s" probably not an album of "%s" (ratio=%.2f)', + album, artist, ratio) + continue + return candidates # #### / Search Methods ### # VIM MODLINE