X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Flastfm.py;h=ec612eed10edf10cc90804aca45565fa9afb1253;hb=08ce3d59f8f416d3fc036047aa01a86a93b421e9;hp=01e8cd98160625bf7905d4479e4376c1ff07a690;hpb=c1bda032095902bdcd183c530a9c4de28f3c828a;p=mpd-sima.git diff --git a/sima/plugins/lastfm.py b/sima/plugins/lastfm.py index 01e8cd9..ec612ee 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 @@ -37,6 +35,26 @@ def cache(func): return results return wrapper +def blacklist(artist=False, album=False, track=False): + field = (bl for bl in (artist, album, track)) + def decorated(func): + def wrapper(*args, **kwargs): + cls = args[0] + 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, field) if bl is True) + bl_getter = next(dropwhile(lambda _: not next(field), bl_fun)) + results = func(*args, **kwargs) + cls.log.debug('using {0} as bl filter'.format(bl_getter.__name__)) + for elem in results: + if bl_getter(elem, add_not=True): + cls.log.info('Blacklisted: {0}'.format(elem)) + results.remove(elem) + return results + return wrapper + return decorated + class Lastfm(Plugin): """last.fm similar artists @@ -46,7 +64,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() @@ -79,12 +96,11 @@ class Lastfm(Plugin): """ for _ , val in self._cache.items(): if isinstance(val, dict): - while len(val) > 100: + while len(val) > 150: val.popitem() def get_history(self, artist): - """Check against history for tracks already in history for a specific - artist. + """Constructs list of Track for already played titles for an artist. """ duration = self.daemon_conf.getint('sima', 'history_duration') tracks_from_db = self.sdb.get_history(duration=duration, artist=artist) @@ -117,6 +133,7 @@ class Lastfm(Plugin): 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, @@ -131,62 +148,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): """ @@ -204,8 +166,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): @@ -297,7 +259,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 @@ -311,17 +273,19 @@ class Lastfm(Plugin): def _album(self): """Get albums for album queue mode """ - artists = self.get_local_similar_artists() + #artists = self.get_local_similar_artists() + pass def _top(self): """Get some tracks for top track queue mode """ - artists = self.get_local_similar_artists() + #artists = self.get_local_similar_artists() + pass 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