Fixed top track mode with Artist objects

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

diff --git a/sima/plugins/internal/randomfallback.py b/sima/plugins/internal/randomfallback.py
index cb19f497efbc00972fbc7915f60cb176663fe1de..ee0be20b78822ed645a92bf754a93aab0d91646a 100644 (file)
--- a/sima/plugins/internal/randomfallback.py
+++ b/sima/plugins/internal/randomfallback.py
@@ -28,11 +28,14 @@ import random
 
 # local import
 from ...lib.plugin import Plugin
-from ...lib.track import Track
+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)
@@ -51,29 +54,45 @@ 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):
         trks = list()
         target = self.plugin_conf.getint('track_to_add')
+        limit = 0
         while len(trks) < target:
-            trks.append(self.get_trk())
+            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 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 42:
+            while artists:
                 art = random.choice(artists)
                 if art not in played_art:
                     break
+                artists.pop(art)
         elif self.mode == 'pure':
             art = random.choice(artists)
+        if art is None:
+            return None
         self.log.debug('Random art: {}'.format(art))
-        trk  = random.choice(self.player.find_track(art))
-        self.log.info('random fallback ({}): {}'.format(self.mode, trk))
+        trks = self.player.find_track(Artist(art))
+        if trks:
+            trk = random.choice(trks)
+            self.log.info('random fallback ({}): {}'.format(self.mode, trk))
         return trk