# -*- coding: utf-8 -*-
-# Copyright (c) 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2013-2015, 2020-2021 kaliko <kaliko@azylum.org>
#
# This file is part of sima
#
def __init__(self, daemon):
super().__init__(daemon)
- self.daemon = daemon
self.mode = self.plugin_conf.get('flavour', None)
if self.mode not in ['pure', 'sensible']:
self.log.warning('Bad value for flavour, '
def get_played_artist(self,):
"""Constructs list of already played artists.
"""
- duration = self.daemon.config.getint('sima', 'history_duration')
- tracks_from_db = self.daemon.sdb.get_history(duration=duration)
- artists = [tr[0] for tr in tracks_from_db]
- return set(artists)
+ duration = self.main_conf.getint('sima', 'history_duration')
+ tracks_from_db = self.sdb.get_history(duration=duration)
+ artists = {tr[0] for tr in tracks_from_db}
+ return artists
def filtered_artist(self, artist):
"""Filters artists:
* not blacklisted
"""
if self.mode == 'sensible':
- if self.daemon.sdb.get_bl_artist(artist, add_not=True):
- self.log.debug('Random: Blacklisted "%s"', artist)
+ if self.sdb.get_bl_artist(artist, add_not=True):
+ self.log.debug('Random plugin: Blacklisted "%s"', artist)
return True
if artist in self.get_played_artist():
return True
self.candidates = []
trks = []
target = self.plugin_conf.getint('track_to_add')
- artists = list(self.player.artists)
+ artists = self.player.list('artist', '( artist != "")')
random.shuffle(artists)
for art in artists:
if self.filtered_artist(art):
continue
- self.log.debug('Random art: {}'.format(art))
- trks = self.player.find_track(Artist(art))
+ self.log.debug('Random art: %s', art)
+ trks = self.player.find_tracks(Artist(art))
if trks:
trk = random.choice(trks)
self.candidates.append(trk)
- self.log.info('Random candidate ({}): {}'.format(self.mode, trk))
+ self.log.info('Random plugin chose (%s): %s', self.mode, trk)
if len(self.candidates) >= target:
break
return self.candidates