X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fmpdclient.py;h=0c2e0b2223c8b59d59108eda4e3c40c3a5ee7bab;hb=ee218f16c2a449c6d72d550807114676e1e96d94;hp=6b461bacc28e86476bf5c0471ba419c3d2c2562f;hpb=31cb581a72f067990a5dc3917542d15505f86990;p=mpd-sima.git diff --git a/sima/mpdclient.py b/sima/mpdclient.py index 6b461ba..0c2e0b2 100644 --- a/sima/mpdclient.py +++ b/sima/mpdclient.py @@ -33,7 +33,7 @@ from .utils.leven import levenshtein_ratio class PlayerError(Exception): - """Fatal error in poller.""" + """Fatal error in the player.""" # Some decorators @@ -121,10 +121,16 @@ 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', + needed_tags = {'Artist', 'Album', 'AlbumArtist', 'Title', 'Track'} + needed_mbid_tags = {'MUSICBRAINZ_ARTISTID', 'MUSICBRAINZ_ALBUMID', 'MUSICBRAINZ_ALBUMARTISTID', 'MUSICBRAINZ_TRACKID'} + MPD_supported_tags = {'Artist', 'ArtistSort', 'Album', 'AlbumSort', 'AlbumArtist', + 'AlbumArtistSort', 'Title', 'Track', 'Name', 'Genre', + 'Date', 'OriginalDate', 'Composer', 'Performer', + 'Conductor', 'Work', 'Grouping', 'Disc', 'Label', + 'MUSICBRAINZ_ARTISTID', 'MUSICBRAINZ_ALBUMID', + 'MUSICBRAINZ_ALBUMARTISTID', 'MUSICBRAINZ_TRACKID', + 'MUSICBRAINZ_RELEASETRACKID', 'MUSICBRAINZ_WORKID'} database = None def __init__(self, daemon): @@ -181,10 +187,18 @@ class MPD(MPDClient): raise PlayerError('Could connect to "%s", ' 'but command "%s" not available' % (host, cmd)) - # Controls use of MusicBrainzIdentifier self.tagtypes('clear') + for tag in MPD.needed_tags: + self.tagtypes('enable', tag) + tt = 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) + self.log.warning('Tags needed: %s', needed_tags) + raise PlayerError('Missing mandatory metadata!') for tag in MPD.needed_mbid_tags: self.tagtypes('enable', tag) + # Controls use of MusicBrainzIdentifier if self.daemon.config.get('sima', 'musicbrainzid'): tt = set(self.tagtypes()) if len(MPD.needed_mbid_tags & tt) != len(MPD.needed_mbid_tags): @@ -206,15 +220,20 @@ class MPD(MPDClient): def _reset_cache(self): """ Both flushes and instantiates _cache + + * artists: all artists + * nombid_artists: artists with no mbid (set only when self.use_mbid is True) + * artist_tracks: caching last artist tracks, used in search_track """ if isinstance(self._cache, dict): self.log.info('Player: Flushing cache!') else: self.log.info('Player: Initialising cache!') self._cache = {'artists': frozenset(), - 'nombid_artists': frozenset()} + 'nombid_artists': frozenset(), + 'artist_tracks': {}} self._cache['artists'] = frozenset(filter(None, self.list('artist'))) - if Artist.use_mbid: + if self.use_mbid: artists = self.list('artist', "(MUSICBRAINZ_ARTISTID == '')") self._cache['nombid_artists'] = frozenset(filter(None, artists)) @@ -226,8 +245,7 @@ class MPD(MPDClient): return self.current.id != previous.id # pylint: disable=no-member def monitor(self): - """OLD socket Idler - Monitor player for change + """Monitor player for change Returns a list a events among: * database player media library has changed @@ -256,7 +274,10 @@ class MPD(MPDClient): self.log.warning('pending commands: %s', self._pending) def add(self, payload): - """Overriding MPD's add method to accept Track objects""" + """Overriding MPD's add method to accept Track objects + + :param Track,list payload: Either a single :py:obj:`Track` or a list of it + """ if isinstance(payload, Track): super().__getattr__('add')(payload.file) elif isinstance(payload, list): @@ -331,15 +352,16 @@ class MPD(MPDClient): raise PlayerError('Album object have no artist attribute') albums = [] if self.use_mbid and album.mbid: - filt = f'(MUSICBRAINZ_ALBUMID == {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 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) + for artist in album.artist.names_sz: + filt = f"((albumartist == '{artist}') AND (album == '{album.name_sz}'))" + albums.extend(self.find(filt)) return albums # #### / find_tracks ## @@ -360,9 +382,16 @@ class MPD(MPDClient): found = False if self.use_mbid and artist.mbid: # look for exact search w/ musicbrainz_artistid - found = bool(self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')")) - if found: + library = self.list('artist', f"(MUSICBRAINZ_ARTISTID == '{artist.mbid}')") + if library: + found = True self.log.trace('Found mbid "%r" in library', artist) + # library could fetch several artist name for a single MUSICBRAINZ_ARTISTID + if len(library) > 1: + self.log.debug('I got "%s" searching for %r', library, artist) + elif len(library) == 1 and library[0] != artist.name: + self.log.info('Update artist name %s->%s', artist, library[0]) + artist = Artist(name=library[0], mbid=artist.mbid) # Fetches remaining artists for potential match artists = self._cache['nombid_artists'] else: # not using MusicBrainzIDs @@ -371,8 +400,9 @@ class MPD(MPDClient): 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 + self.log.debug('found close match for "%s": %s', + artist, '/'.join(match)) + # First lowercased comparison for close_art in match: # Regular lowered string comparison if artist.name.lower() == close_art.lower(): @@ -386,6 +416,7 @@ class MPD(MPDClient): self.log.trace('no fuzzy matching for %r', artist) if found: return artist + return None # Now perform fuzzy search for fuzz in match: if fuzz in artist.names: # Already found in lower cased comparison @@ -394,11 +425,11 @@ class MPD(MPDClient): if SimaStr(artist.name) == fuzz: found = True artist.add_alias(fuzz) - self.log.info('"%s" quite probably matches "%s" (SimaStr)', - fuzz, artist) + self.log.debug('"%s" quite probably matches "%s" (SimaStr)', + fuzz, artist) if found: if artist.aliases: - self.log.debug('Found aliases: %s', '/'.join(artist.names)) + self.log.info('Found aliases: %s', '/'.join(artist.names)) return artist return None @@ -406,26 +437,31 @@ class MPD(MPDClient): def search_track(self, artist, title): """Fuzzy search of title by an artist """ + cache = self._cache.get('artist_tracks').get(artist) # Retrieve all tracks from artist - all_tracks = self.find_tracks(artist) + all_tracks = cache or self.find_tracks(artist) + if not cache: + self._cache['artist_tracks'] = {} # clean up + self._cache.get('artist_tracks')[artist] = all_tracks # 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]) match = get_close_matches(title, all_artist_titles, 50, 0.78) + tracks = [] if not match: return [] for mtitle in match: - leven = levenshtein_ratio(title.lower(), mtitle.lower()) + leven = levenshtein_ratio(title, mtitle) if leven == 1: - pass - elif leven >= 0.79: # PARAM + tracks.extend([t for t in all_tracks if t.title == mtitle]) + elif leven >= 0.77: self.log.debug('title: "%s" should match "%s" (lr=%1.3f)', mtitle, title, leven) + tracks.extend([t for t in all_tracks if t.title == mtitle]) else: self.log.debug('title: "%s" does not match "%s" (lr=%1.3f)', mtitle, title, leven) - return [] - return self.find('artist', artist, 'title', mtitle) + return tracks @blacklist(album=True) def search_albums(self, artist):