Fixed issues in reorg and album_candidate

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

diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py
index 9a931fcaecf40deebbe454fcdfee7a7612a4ed54..ad326ef3a1f3f587c3ba6c89332a847aaa072426 100644 (file)
--- a/sima/plugins/internal/tags.py
+++ b/sima/plugins/internal/tags.py
@@ -28,8 +28,8 @@ import random
 from musicpd import CommandError
 
 # local import
-from ...lib.plugin import Plugin
-from ...lib.track import Track
+from ...lib.plugin import AdvancedPlugin
+from ...lib.meta import Artist
 from ...utils.utils import PluginException
 
 
@@ -53,14 +53,14 @@ def forge_filter(cfg):
     return mpd_filter
 
 
-class Tags(Plugin):
+class Tags(AdvancedPlugin):
     """Add track based on tags content
     """
     supported_tags = {'comment', 'date', 'genre', 'label', 'originaldate'}
+    options = {'queue_mode', 'priority', 'filter', 'track_to_add', 'album_to_add'}
 
     def __init__(self, daemon):
         super().__init__(daemon)
-        self.daemon = daemon
         self._control_conf()
         self.mpd_filter = forge_filter(self.plugin_conf)
         self._setup_tagsneeded()
@@ -69,7 +69,7 @@ class Tags(Plugin):
     def _control_conf(self):
         sup_tags = Tags.supported_tags
         config_tags = {k for k, v in self.plugin_conf.items()
-                       if (v and k not in ['filter', 'priority', 'track_to_add'])}
+                       if (v and k not in Tags.options)}
         if not self.plugin_conf.get('filter', None) and \
                 config_tags.isdisjoint(sup_tags):
             self.log.error('Found no config for %s plugin! '
@@ -93,14 +93,6 @@ class Tags(Plugin):
         tags = config_tags & Tags.supported_tags
         self.player.needed_tags |= tags
 
-    def _get_history(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)
-        hist = [Track(file=tr[3], artist=tr[0]) for tr in tracks_from_db]
-        return hist
-
     def start(self):
         if (0, 21, 0) > tuple(map(int, self.player.mpd_version.split('.'))):
             self.log.warning('MPD protocol version: %s < 0.21.0',
@@ -120,25 +112,31 @@ class Tags(Plugin):
 
     def callback_need_track(self):
         candidates = []
-        target = self.plugin_conf.getint('track_to_add')
-        tracks = self.player.find(self.mpd_filter)
-        random.shuffle(tracks)
-        history = self._get_history()
-        while tracks:
-            trk = tracks.pop()
-            if trk in self.player.queue or \
-               trk in candidates:
-                self.log.debug('%s already queued', trk)
-                continue
-            if trk in history:
-                self.log.debug('%s in history', trk)
+        queue_mode = self.plugin_conf.get('queue_mode', 'track')
+        target = self.plugin_conf.getint(f'{queue_mode}_to_add')
+        # look for artists acording to filter
+        artists = self.player.list('artist', self.mpd_filter)
+        random.shuffle(artists)
+        artists = self.get_reorg_artists_list(artists)
+        self.log.debug('Tags artists found: %s', ' / '.join(artists))
+        for artist in artists:
+            self.log.debug('looking for %s', artist)
+            tracks = self.player.find_tracks(Artist(name=artist))
+            trk = self.filter_track(tracks)
+            if not trk:
                 continue
-            candidates.append(trk)
-            self.log.info('Tags candidate: {}'.format(trk))
-            if len(candidates) >= target:
-                break
-        if not candidates:
-            self.log.info('Tags plugin failed to find some tracks')
+            if queue_mode == 'track':
+                self.log.info('Tags plugin chose: {}'.format(trk))
+                candidates.append(trk)
+                if len(candidates) == target:
+                    break
+            else:
+                album = self.album_candidate(trk.Artist, unplayed=True)
+                if not album:
+                    continue
+                candidates.extend(self.player.find_tracks(album))
+                if len({t.album for t in candidates}) == target:
+                    break
         return candidates
 
 # VIM MODLINE