Fixed some code style and comment

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

diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py
index 5cad0e821652069a0a057eb1374c1211a17d6df2..9a931fcaecf40deebbe454fcdfee7a7612a4ed54 100644 (file)
--- a/sima/plugins/internal/tags.py
+++ b/sima/plugins/internal/tags.py
@@ -62,8 +62,8 @@ class Tags(Plugin):
         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):
@@ -82,9 +82,14 @@ 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
 
@@ -107,7 +112,8 @@ class Tags(Plugin):
         # 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'])