X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Frandomfallback.py;h=ee0be20b78822ed645a92bf754a93aab0d91646a;hb=65385738f889849be01cb70815e8899e319c9532;hp=bb41bde933df9b6b9e51f892f915b9bdc38fd68a;hpb=46918496aae0f5759dcaebe0ce0d13e4c5737f8b;p=mpd-sima.git

diff --git a/sima/plugins/internal/randomfallback.py b/sima/plugins/internal/randomfallback.py
index bb41bde..ee0be20 100644
--- a/sima/plugins/internal/randomfallback.py
+++ b/sima/plugins/internal/randomfallback.py
@@ -28,10 +28,14 @@ import random
 
 # local import
 from ...lib.plugin import Plugin
+from ...lib.meta import Artist
 
 
 class RandomFallBack(Plugin):
-    """Add random track as fallback"""
+    """Add random track as fallback
+    TODO: refactor, this plugin does not look good to me.
+          callback_need_track_fb/get_trk articulation is not elegant at all
+    """
 
     def __init__(self, daemon):
         super().__init__(daemon)
@@ -56,18 +60,24 @@ class RandomFallBack(Plugin):
     def callback_need_track_fb(self):
         trks = list()
         target = self.plugin_conf.getint('track_to_add')
+        limit = 0
         while len(trks) < target:
             trk = self.get_trk()
             if trk:
                 trks.append(trk)
+            else:
+                limit += 1
+                if limit > 3:
+                    return trks
         return trks
 
     def get_trk(self):
-        """Get a single track acording to random flavour
+        """Get a single track according to random flavour
         """
         trk = None
+        art = None
         artists = list(self.player.artists)
-        if self.mode == 'sensitive':
+        if self.mode == 'sensible':
             played_art = self.get_played_artist()
             while artists:
                 art = random.choice(artists)
@@ -76,8 +86,10 @@ class RandomFallBack(Plugin):
                 artists.pop(art)
         elif self.mode == 'pure':
             art = random.choice(artists)
+        if art is None:
+            return None
         self.log.debug('Random art: {}'.format(art))
-        trks = self.player.find_track(art)
+        trks = self.player.find_track(Artist(art))
         if trks:
             trk = random.choice(trks)
             self.log.info('random fallback ({}): {}'.format(self.mode, trk))