X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Ftags.py;h=0af81ef3f0b7699dfc408b9e931d1203359e1848;hb=d0232dae194becb33696266083df400a54afbd27;hp=6a2acf74c010d6cc5103f526bc55709268e90ff7;hpb=45a6d5d8e466f8c82e3d85c3442c7e437a449b6e;p=mpd-sima.git

diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py
index 6a2acf7..0af81ef 100644
--- a/sima/plugins/internal/tags.py
+++ b/sima/plugins/internal/tags.py
@@ -28,10 +28,11 @@ 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
 
+
 def forge_filter(cfg):
     tags = set(cfg.keys()) & Tags.supported_tags
     cfg_filter = cfg.get('filter', None)
@@ -52,23 +53,23 @@ 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._setup_tagsneeded()
         self.mpd_filter = forge_filter(self.plugin_conf)
+        self._setup_tagsneeded()
         self.log.debug('mpd filter: %s', self.mpd_filter)
 
     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! '
@@ -81,41 +82,41 @@ class Tags(Plugin):
             raise PluginException('plugin misconfiguration')
 
     def _setup_tagsneeded(self):
-        config_tags = {k for k, v in self.plugin_conf.items() if v}
-        self.log.debug('%s plugin needs the followinng metadata: %s',
-                self, config_tags & Tags.supported_tags)
+        """Ensure needed tags are exposed by MPD"""
+        # At this point mpd_filter concatenetes {tags}+filter
+        config_tags = set()
+        for mpd_supp_tags in self.player.MPD_supported_tags:
+            if mpd_supp_tags.lower() in self.mpd_filter.lower():
+                config_tags.add(mpd_supp_tags.lower())
+        self.log.debug('%s plugin needs the following metadata: %s',
+                       self, config_tags)
         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',
-                    self.player.mpd_version)
-            self.log.error('Need at least MPD 0.21 to use Tags plugin (filters required)')
+                             self.player.mpd_version)
+            self.log.error(
+                'Need at least MPD 0.21 to use Tags plugin (filters required)')
             self.player.disconnect()
             raise PluginException('MPD >= 0.21 required')
         # Check filter is valid
         try:
             if self.plugin_conf['filter']:
-                self.player.find(self.plugin_conf['filter'])
+                # Use window to limit response size
+                self.player.find(self.plugin_conf['filter'], "window", (0, 1))
         except CommandError:
             raise PluginException('Badly formated filter in tags plugin configuration: "%s"'
                                   % self.plugin_conf['filter'])
 
-    def callback_need_track(self):
+    def callback_need_track_(self):
         candidates = []
-        target = self.plugin_conf.getint('track_to_add')
+        queue_mode = self.plugin_conf.get('queue_mode', 'track')
+        target = self.plugin_conf.getint(f'{queue_mode}_to_add')
         tracks = self.player.find(self.mpd_filter)
         random.shuffle(tracks)
-        history = self._get_history()
+        history = self.get_history()
         while tracks:
             trk = tracks.pop()
             if trk in self.player.queue or \
@@ -129,9 +130,45 @@ class Tags(Plugin):
             self.log.info('Tags candidate: {}'.format(trk))
             if len(candidates) >= target:
                 break
+        if queue_mode == 'track':
+            return candidates
+        if queue_mode == 'album':
+            for trk in candidates:
+                self.log.info(trk.Artist)
+                _ = self.album_candidate(trk.Artist)
         if not candidates:
             self.log.info('Tags plugin failed to find some tracks')
         return candidates
 
+    def callback_need_track(self):
+        candidates = []
+        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 candidates: %s', ' / '.join(artists))
+        for artist in artists:
+            if artist in {t.Artist for t in self.player.queue}:
+                continue
+            self.log.debug('looking for %s', artist)
+            trk = self.filter_track(self.player.find_tracks(Artist(name=artist)))
+            if not trk:
+                continue
+            if queue_mode == 'track':
+                self.log.info('Tags candidate: {}'.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
 # vim: ai ts=4 sw=4 sts=4 expandtab