X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Flastfm.py;h=679aaa6a78f52156972b8f4f6396ce625dd41a28;hb=9710a7d7676359c1895dfc52297018d4e46f270f;hp=7f2397a8eb13f38f81f6c90b08a940b234abec15;hpb=e09e76d41b2f041de935e9e884009e3187005ab9;p=mpd-sima.git diff --git a/sima/plugins/lastfm.py b/sima/plugins/lastfm.py index 7f2397a..679aaa6 100644 --- a/sima/plugins/lastfm.py +++ b/sima/plugins/lastfm.py @@ -7,16 +7,14 @@ Fetching similar artists from last.fm web services import random from collections import deque -from difflib import get_close_matches +from itertools import dropwhile from hashlib import md5 # third parties componants # local import -from ..utils.leven import levenshtein_ratio from ..lib.plugin import Plugin from ..lib.simafm import SimaFM, XmlFMHTTPError, XmlFMNotFound, XmlFMError -from ..lib.simastr import SimaStr from ..lib.track import Track @@ -38,6 +36,36 @@ def cache(func): return wrapper +def blacklist(artist=False, album=False, track=False): + #pylint: disable=C0111,W0212 + field = (artist, album, track) + def decorated(func): + def wrapper(*args, **kwargs): + cls = args[0] + boolgen = (bl for bl in field) + bl_fun = (cls._Plugin__daemon.sdb.get_bl_artist, + cls._Plugin__daemon.sdb.get_bl_album, + cls._Plugin__daemon.sdb.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__)) + if artist: + results = func(*args, **kwargs) + for elem in results: + if bl_getter(elem, add_not=True): + cls.log.info('Blacklisted: {0}'.format(elem)) + results.remove(elem) + return results + if track: + for elem in args[1]: + if bl_getter(elem, add_not=True): + cls.log.info('Blacklisted: {0}'.format(elem)) + args[1].remove(elem) + return func(*args, **kwargs) + return wrapper + return decorated + + class Lastfm(Plugin): """last.fm similar artists """ @@ -46,7 +74,6 @@ class Lastfm(Plugin): Plugin.__init__(self, daemon) self.daemon_conf = daemon.config self.sdb = daemon.sdb - self.player = daemon.player self.history = daemon.short_history ## self.to_add = list() @@ -92,11 +119,13 @@ class Lastfm(Plugin): file=tr[3]) for tr in tracks_from_db] return played_tracks + #@blacklist(track=True) def filter_track(self, tracks): """ Extract one unplayed track from a Track object list. * not in history * not already in the queue + * not blacklisted """ artist = tracks[0].artist black_list = self.player.queue + self.to_add @@ -104,18 +133,34 @@ class Lastfm(Plugin): if not not_in_hist: self.log.debug('All tracks already played for "{}"'.format(artist)) random.shuffle(not_in_hist) - candidate = [ trk for trk in not_in_hist if trk not in black_list ] + #candidate = [ trk for trk in not_in_hist if trk not in black_list + #if not self.sdb.get_bl_track(trk, add_not=True)] + candidate = [] + for trk in [_ for _ in not_in_hist if _ not in black_list]: + if self.sdb.get_bl_track(trk, add_not=True): + self.log.info('Blacklisted: {0}: '.format(trk)) + continue + if self.sdb.get_bl_album(trk, add_not=True): + self.log.info('Blacklisted album: {0}: '.format(trk)) + continue + candidate.append(trk) if not candidate: self.log.debug('Unable to find title to add' + - ' for "%s".' % artist) + ' for "%s".' % artist) return None + #@blacklist(track=True) + #def deco(self, args): + #return args + #candidate = deco(self, candidate) self.to_add.append(random.choice(candidate)) + return self.to_add def _get_artists_list_reorg(self, alist): """ Move around items in artists_list in order to play first not recently played artists """ + # TODO: move to utils as a decorator duration = self.daemon_conf.getint('sima', 'history_duration') art_in_hist = list() for trk in self.sdb.get_history(duration=duration, @@ -130,62 +175,7 @@ class Lastfm(Plugin): ' / '.join(art_not_in_hist))) return art_not_in_hist - def _cross_check_artist(self, art): - """ - Controls presence of artists in liste in music library. - Crosschecking artist names with SimaStr objects / difflib / levenshtein - - TODO: proceed crosschecking even when an artist matched !!! - Not because we found "The Doors" as "The Doors" that there is no - remaining entries as "Doors" :/ - not straight forward, need probably heavy refactoring. - """ - matching_artists = list() - artist = SimaStr(art) - all_artists = self._cache.get('artists') - - # Check against the actual string in artist list - if artist.orig in all_artists: - self.log.debug('found exact match for "%s"' % artist) - return [artist] - # Then proceed with fuzzy matching if got nothing - match = get_close_matches(artist.orig, all_artists, 50, 0.73) - if not match: - return [] - 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.orig and len(artist) < 8: - for fuzz_art in match: - # Regular string comparison SimaStr().lower is regular string - if artist.lower() == fuzz_art.lower(): - matching_artists.append(fuzz_art) - self.log.debug('"%s" matches "%s".' % (fuzz_art, artist)) - return matching_artists - for fuzz_art in match: - # Regular string comparison SimaStr().lower is regular string - if artist.lower() == fuzz_art.lower(): - matching_artists.append(fuzz_art) - self.log.debug('"%s" matches "%s".' % (fuzz_art, artist)) - return matching_artists - # Proceed with levenshtein and SimaStr - leven = levenshtein_ratio(artist.stripped.lower(), - SimaStr(fuzz_art).stripped.lower()) - # SimaStr string __eq__, not regular string comparison here - if artist == fuzz_art: - matching_artists.append(fuzz_art) - self.log.info('"%s" quite probably matches "%s" (SimaStr)' % - (fuzz_art, artist)) - elif leven >= 0.82: # PARAM - matching_artists.append(fuzz_art) - self.log.debug('FZZZ: "%s" should match "%s" (lr=%1.3f)' % - (fuzz_art, artist, leven)) - else: - self.log.debug('FZZZ: "%s" does not match "%s" (lr=%1.3f)' % - (fuzz_art, artist, leven)) - return matching_artists - + @blacklist(artist=True) @cache def get_artists_from_player(self, similarities): """ @@ -203,8 +193,8 @@ class Lastfm(Plugin): art_pop, match = similarities.pop() if match < similarity: break - results.extend(self._cross_check_artist(art_pop)) - results and self.log.debug('Similarity: %d%%' % match) + results.extend(self.player.fuzzy_find(art_pop)) + results and self.log.debug('Similarity: %d%%' % match) # pylint: disable=w0106 return results def lfm_similar_artists(self, artist=None): @@ -296,7 +286,7 @@ class Lastfm(Plugin): self.log.debug('Trying to find titles to add for "{}"'.format( artist)) found = self.player.find_track(artist) - # find tracks not in history + # find tracks not in history for artist self.filter_track(found) if len(self.to_add) == nbtracks_target: break @@ -322,7 +312,7 @@ class Lastfm(Plugin): def callback_need_track(self): self._cleanup_cache() if not self.player.current: - self.log.info('No currently playing track, cannot queue') + self.log.info('Not currently playing track, cannot queue') return None self.queue_mode() candidates = self.to_add