Fixed blacklisting in track mode

[mpd-sima.git] / sima / plugins / internal / randomfallback.py

diff --git a/sima/plugins/internal/randomfallback.py b/sima/plugins/internal/randomfallback.py
index f2eaac4dc9eb412819c64b16a8c5068793697f2a..e6bd78be91821d36d36362751ae4233b0f9b5e2e 100644 (file)
--- a/sima/plugins/internal/randomfallback.py
+++ b/sima/plugins/internal/randomfallback.py
@@ -1,19 +1,37 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """
 Fetching similar artists from last.fm web services
 """
 
-# standart library import
+# standard library import
 import random
 
-# third parties componants
+# third parties components
 
 # local import
 from ...lib.plugin import Plugin
-from ...lib.track import Track
 
 
 class RandomFallBack(Plugin):
+    """Add random track as fallback"""
 
     def __init__(self, daemon):
         super().__init__(daemon)
@@ -21,9 +39,9 @@ class RandomFallBack(Plugin):
         if not self.plugin_conf:
             return
         self.mode = self.plugin_conf.get('flavour', None)
-        if self.mode not in ['pure', 'sensible', 'genre']:
+        if self.mode not in ['pure', 'sensible']:
             self.log.warning('Bad value for flavour, '
-                    '{} not in ["pure", "sensible", "genre"]'.format(self.mode))
+                    '"{}" not in ["pure", "sensible"]'.format(self.mode))
             self.mode = 'pure'
 
     def get_played_artist(self,):
@@ -32,21 +50,32 @@ class RandomFallBack(Plugin):
         duration = self.daemon.config.getint('sima', 'history_duration')
         tracks_from_db = self.daemon.sdb.get_history(duration=duration)
         # Construct Track() objects list from database history
-        artists = [ tr[-1] for tr in tracks_from_db ]
+        artists = [tr[-1] for tr in tracks_from_db]
         return set(artists)
 
     def callback_need_track_fb(self):
-        art = random.choice(self.player.list('artist'))
-        self.log.debug('Random art: {}'.format(art))
+        trks = list()
+        target = self.plugin_conf.getint('track_to_add')
+        while len(trks) < target:
+            trks.append(self.get_trk())
+        return trks
+
+    def get_trk(self):
+        """Get a single track acording to random flavour
+        """
+        artists = list(self.player.artists)
         if self.mode == 'sensitive':
             played_art = self.get_played_artist()
             while 42:
-                art = random.choice(self.player.list('artist'))
+                art = random.choice(artists)
                 if art not in played_art:
                     break
-        trk  = random.choice(self.player.find_track(art))
+        elif self.mode == 'pure':
+            art = random.choice(artists)
+        self.log.debug('Random art: {}'.format(art))
+        trk = random.choice(self.player.find_track(art))
         self.log.info('random fallback ({}): {}'.format(self.mode, trk))
-        return [trk]
+        return trk