More robust randomfallback

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

diff --git a/sima/plugins/internal/randomfallback.py b/sima/plugins/internal/randomfallback.py
index 845a41ab1a133c28d6b9df6d7b9c4fe5626b2931..bb41bde933df9b6b9e51f892f915b9bdc38fd68a 100644 (file)
--- a/sima/plugins/internal/randomfallback.py
+++ b/sima/plugins/internal/randomfallback.py
@@ -50,31 +50,37 @@ 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')
         while len(trks) < target:
-            trks.append(self.get_trk())
+            trk = self.get_trk()
+            if trk:
+                trks.append(trk)
         return trks
 
     def get_trk(self):
         """Get a single track acording to random flavour
         """
+        trk = None
         artists = list(self.player.artists)
         if self.mode == 'sensitive':
             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)
         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(art)
+        if trks:
+            trk = random.choice(trks)
+            self.log.info('random fallback ({}): {}'.format(self.mode, trk))
         return trk