X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=b8e1b4c1ce0158791b83a469b85ad852e02eb379;hb=fe996f4e06a7c1f90e66769edb4f869379ebdfc5;hp=5c32b775feb9906c6317e44172db3cb9838655ea;hpb=d1650da737a01f0c480ffe8035fb56051e3cef1d;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index 5c32b77..b8e1b4c 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2020 kaliko +# Copyright (c) 2009-2021 kaliko # # This file is part of sima # @@ -19,7 +19,7 @@ # standard library import from difflib import get_close_matches from functools import wraps -from itertools import dropwhile +from logging import getLogger # external module from musicpd import MPDClient, MPDError @@ -42,21 +42,18 @@ def bl_artist(func): cls = args[0] if not cls.database: return func(*args, **kwargs) - result = func(*args, **kwargs) - if not result: + results = func(*args, **kwargs) + if not results: return None - 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 None - resp = Artist(name=names.pop(), mbid=result.mbid) - for name in names: - resp.add_alias(name) - return resp + for art in results.names: + mbid = results.mbid + if not mbid: + mbid = cls._find_musicbrainz_artistid(results) + artist = Artist(name=art, mbid=mbid) + if cls.database.get_bl_artist(artist, add=False): + cls.log.debug('Artist in blocklist: %s', artist) + return None + return results return wrapper @@ -74,37 +71,6 @@ def tracks_wrapper(func): # / decorators -def blacklist(artist=False, album=False, track=False): - # pylint: disable=C0111,W0212 - field = (album, track) - - def decorated(func): - def wrapper(*args, **kwargs): - if not args[0].database: - return func(*args, **kwargs) - cls = args[0] - boolgen = (bl for bl in field) - bl_fun = (cls.database.get_bl_album, - cls.database.get_bl_track,) - #bl_getter = next(fn for fn, bl in zip(bl_fun, boolgen) if bl is True) - bl_getter = next(dropwhile(lambda _: not next(boolgen), bl_fun)) - #cls.log.debug('using {0} as bl filter'.format(bl_getter.__name__)) - results = list() - for elem in func(*args, **kwargs): - if bl_getter(elem, add_not=True): - #cls.log.debug('Blacklisted "{0}"'.format(elem)) - continue - 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. "%s"', elem) - continue - results.append(elem) - return results - return wrapper - return decorated - - class MPD(MPDClient): """ Player instance inheriting from MPDClient (python-musicpd). @@ -133,12 +99,11 @@ class MPD(MPDClient): 'MUSICBRAINZ_RELEASETRACKID', 'MUSICBRAINZ_WORKID'} database = None - def __init__(self, daemon): + def __init__(self, config): super().__init__() self.use_mbid = True - self.daemon = daemon - self.log = daemon.log - self.config = self.daemon.config['MPD'] + self.log = getLogger('sima') + self.config = config self._cache = None # ######### Overriding MPDClient ########### @@ -156,10 +121,11 @@ class MPD(MPDClient): def connect(self): """Overriding explicitly MPDClient.connect()""" + mpd_config = self.config['MPD'] # host, port, password - host = self.config.get('host') - port = self.config.get('port') - password = self.config.get('password', fallback=None) + host = mpd_config.get('host') + port = mpd_config.get('port') + password = mpd_config.get('password', fallback=None) self.disconnect() try: super().connect(host, port) @@ -199,7 +165,7 @@ class MPD(MPDClient): for tag in MPD.needed_mbid_tags: self.tagtypes('enable', tag) # Controls use of MusicBrainzIdentifier - if self.daemon.config.get('sima', 'musicbrainzid'): + if self.config.getboolean('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 ' @@ -341,21 +307,43 @@ class MPD(MPDClient): def _find_art(self, artist): tracks = set() + # artist blocklist + if self.database.get_bl_artist(artist, add=False): + self.log.info('Artist in blocklist: %s', artist) + return [] if artist.mbid: tracks |= set(self.find('musicbrainz_artistid', artist.mbid)) - for name in artist.names_sz: + for name in artist.names: tracks |= set(self.find('artist', name)) + # album blocklist + albums = {Album(trk.album, 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')} + if albums & bl_albums: + self.log.info('Albums in blocklist for %s: %s', artist, albums & bl_albums) + tracks = {trk for trk in tracks if trk.Album not in bl_albums} + # track blocklist + bl_tracks = {Track(title=t.get('title'), file=t.get('file')) + for t in self.database.view_bl() if t.get('title')} + if tracks & bl_tracks: + self.log.info('Tracks in blocklist for %s: %s', + artist, tracks & bl_tracks) + tracks = {trk for trk in tracks if trk not in bl_tracks} return list(tracks) def _find_alb(self, album): if not hasattr(album, 'artist'): raise PlayerError('Album object have no artist attribute') + if self.database.get_bl_album(album, add=False): + self.log.info('Album in blocklist: %s', album) + return [] albums = [] - if self.use_mbid and album.mbid: + if album.mbid: filt = f"(MUSICBRAINZ_ALBUMID == '{album.mbid}')" albums = self.find(filt) # Now look for album with no MusicBrainzIdentifier - if not albums and album.artist.mbid and self.use_mbid: # Use album artist MBID if possible + if not albums and album.artist.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 @@ -366,6 +354,23 @@ class MPD(MPDClient): # #### / find_tracks ## # #### Search Methods ##### + def _find_musicbrainz_artistid(self, artist): + if not self.use_mbid: + return None + mbids = self.list('MUSICBRAINZ_ARTISTID', + f'(artist == "{artist.name_sz}")') + if not mbids: + return None + if len(mbids) > 1: + self.log.debug("Got multiple MBID for artist: %r", artist) + return None + if artist.mbid: + if artist.mbid != mbids[0]: + self.log('MBID discrepancy, %s found with %s (instead of %s)', + artist.name, mbids[0], artist.mbid) + else: + return mbids[0] + @bl_artist def search_artist(self, artist): """ @@ -380,7 +385,7 @@ class MPD(MPDClient): Returns an Artist object """ found = False - if self.use_mbid and artist.mbid: + if artist.mbid: # look for exact search w/ musicbrainz_artistid library = self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')") if library: @@ -436,7 +441,6 @@ class MPD(MPDClient): return artist return None - @blacklist(track=True) def search_track(self, artist, title): """Fuzzy search of title by an artist """ @@ -466,7 +470,6 @@ class MPD(MPDClient): mtitle, title, leven) return tracks - @blacklist(album=True) def search_albums(self, artist): """Find potential albums for "artist" @@ -474,7 +477,7 @@ class MPD(MPDClient): → 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. + looking for albums for Artist_B wrongly returns this album. """ # First, look for all potential albums self.log.debug('Searching album for "%r"', artist) @@ -482,8 +485,19 @@ class MPD(MPDClient): 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] + mpd_filter = f"((albumartist == '{name_sz}') AND ( album != ''))" + raw_albums = self.list('album', mpd_filter) + albums = list() + for alb in raw_albums: + mbid = None + if self.use_mbid: + _ = Album(alb) + mpd_filter = f"((albumartist == '{artist.name_sz}') AND ( album == '{_.name_sz}'))" + mbids = self.list('MUSICBRAINZ_ALBUMID', mpd_filter) + if mbids: + mbid = mbids[0] + albums.append(Album(alb, albumartist=artist.name, + artist=artist.name, mbid=mbid)) candidates = [] for album in albums: album_trks = self.find_tracks(album) @@ -510,6 +524,9 @@ class MPD(MPDClient): self.log.debug('"%s" probably not an album of "%s" (ratio=%.2f)', album, artist, ratio) continue + for alb in albums: + if self.database.get_bl_album(album, add=False): + candidates.remove(album) return candidates # #### / Search Methods ###