X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fplugin.py;h=c38683af971e6aad172fe87cbfbe20750be7499b;hb=76faf2eccfe59a86fa6636973fdcb21d81f47387;hp=3839f8754505591550f632cee6a31ab27db1b59d;hpb=35012360f9d528bca294f6bbe2ca3ad843d09630;p=mpd-sima.git diff --git a/sima/lib/plugin.py b/sima/lib/plugin.py index 3839f87..c38683a 100644 --- a/sima/lib/plugin.py +++ b/sima/lib/plugin.py @@ -46,13 +46,14 @@ class Plugin: if cls.__doc__: doc = cls.__doc__.strip(' \n').splitlines()[0] return {'name': cls.__name__, - 'doc': doc,} + 'doc': doc} def __init__(self, daemon): self.log = daemon.log - self.__daemon = daemon self.player = daemon.player self.plugin_conf = None + self.main_conf = daemon.config + self.sdb = daemon.sdb self.__get_config() def __str__(self): @@ -61,7 +62,7 @@ class Plugin: def __get_config(self): """Get plugin's specific configuration from global applications's config """ - conf = self.__daemon.config + conf = self.main_conf for sec in conf.sections(): # Discovering plugin conf if sec == self.__class__.__name__.lower(): self.plugin_conf = conf[sec] @@ -70,7 +71,7 @@ class Plugin: if not self.plugin_conf: self.plugin_conf = {'priority': '80'} #if self.plugin_conf: - # self.log.debug('Got config for %s: %s', self, self.plugin_conf) + # self.log.debug('Got config for %s: %s', self, self.plugin_conf) @property def priority(self): @@ -127,25 +128,22 @@ class Plugin: pass -class AdvancedLookUp: +class AdvancedPlugin(Plugin): """Object to derive from for plugins Exposes advanced music library look up with use of play history """ - def __init__(self, daemon): - self.log = daemon.log - self.daemon = daemon - self.player = daemon.player - # Query History def get_history(self, artist=False): - """Constructs list of already played artists. + """Constructs Track list of already played artists. + + :param Artist artist: Artist object to look history for """ - duration = self.daemon.config.getint('sima', 'history_duration') + duration = self.main_conf.getint('sima', 'history_duration') name = None if artist: name = artist.name - from_db = self.daemon.sdb.get_history(duration=duration, artist=name) + from_db = self.sdb.get_history(duration=duration, artist=name) hist = [Track(artist=tr[0], album=tr[1], title=tr[2], file=tr[3]) for tr in from_db] return hist @@ -162,58 +160,67 @@ class AdvancedLookUp: def get_reorg_artists_list(self, alist): """ - Move around items in artists_list in order to play first not recently - played artists + Move around items in alist in order to have first not recently + played (or about to be played) artists. - :param list(str) alist: + :param list(str) alist: artist name list (Not an Artist object) """ - hist = list() - duration = self.daemon.config.getint('sima', 'history_duration') - for art in self.daemon.sdb.get_artists_history(alist, duration=duration): + queued_artist = {_.artist for _ in self.player.queue} + not_queued_artist = set(alist) - queued_artist + duration = self.main_conf.getint('sima', 'history_duration') + hist = [] + for art in self.sdb.get_artists_history(alist, + duration=duration): if art not in hist: - hist.insert(0, art) - reorg = [art for art in alist if art not in hist] + if art not in queued_artist: + hist.insert(0, art) + else: + hist.append(art) + # Find not recently played (not in history) + reorg = [art for art in not_queued_artist if art not in hist] reorg.extend(hist) return reorg # /Query History # Find not recently played/unplayed def album_candidate(self, artist, unplayed=True): - """ + """Search an album for artist + :param Artist artist: Artist to fetch an album for :param bool unplayed: Fetch only unplayed album """ self.log.info('Searching an album for "%s"...' % artist) albums = self.player.search_albums(artist) if not albums: - return [] - self.log.debug('Albums candidate: %s', albums) + return None + self.log.debug('Albums candidates: %s', albums) albums_hist = self.get_album_history(artist) - self.log.debug('Albums history: %s', albums_hist) + self.log.trace('Albums history: %s', [a.name for a in albums_hist]) albums_not_in_hist = [a for a in albums if a.name not in albums_hist] # Get to next artist if there are no unplayed albums if not albums_not_in_hist: self.log.info('No unplayed album found for "%s"' % artist) if unplayed: - return [] + return None random.shuffle(albums_not_in_hist) albums_not_in_hist.extend(albums_hist) + self.log.debug('Albums candidate: %s', albums_not_in_hist) album_to_queue = [] for album in albums_not_in_hist: # Controls the album found is not already queued if album in {t.album for t in self.player.queue}: self.log.debug('"%s" already queued, skipping!', album) - return [] + continue # In random play mode use complete playlist to filter if self.player.playmode.get('random'): if album in {t.album for t in self.player.playlist}: self.log.debug('"%s" already in playlist, skipping!', album) - return [] + continue album_to_queue = album if not album_to_queue: self.log.info('No album found for "%s"', artist) - return [] + return None self.log.info('%s album candidate: %s - %s', self.__class__.__name__, artist, album_to_queue) return album_to_queue @@ -236,16 +243,16 @@ class AdvancedLookUp: if unplayed: return None random.shuffle(not_in_hist) - candidates = [_ for _ in not_in_hist if _ not in deny_list] - # for trk in [_ for _ in not_in_hist if _ not in deny_list]: - # # Should use albumartist heuristic as well - # if self.plugin_conf.getboolean('single_album'): # pylint: disable=no-member - # if (trk.album == self.player.current.album or - # trk.album in [tr.album for tr in black_list]): - # self.log.debug('Found unplayed track ' + - # 'but from an album already queued: %s', trk) - # continue - # candidates.append(trk) + candidates = [] + for trk in [_ for _ in not_in_hist if _ not in deny_list]: + # Should use albumartist heuristic as well + if self.plugin_conf.getboolean('single_album', False): # pylint: disable=no-member + if (trk.album == self.player.current.album or + trk.album in [tr.album for tr in deny_list]): + self.log.debug('Found unplayed track ' + + 'but from an album already queued: %s', trk) + continue + candidates.append(trk) if not candidates: return None return random.choice(candidates)