X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Ftags.py;h=5cad0e821652069a0a057eb1374c1211a17d6df2;hb=8f2cfb30b762325dd79bdee44322631ae0ce486f;hp=4b1d764ac554c6b5c66561d3e0108d865b2f8e52;hpb=aeacbd03b6efcd9fc163560030fdd2e7676a5794;p=mpd-sima.git

diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py
index 4b1d764..5cad0e8 100644
--- a/sima/plugins/internal/tags.py
+++ b/sima/plugins/internal/tags.py
@@ -32,6 +32,7 @@ from ...lib.plugin import Plugin
 from ...lib.track import Track
 from ...utils.utils import PluginException
 
+
 def forge_filter(cfg):
     tags = set(cfg.keys()) & Tags.supported_tags
     cfg_filter = cfg.get('filter', None)
@@ -68,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'])}
+                       if (v and k not in ['filter', 'priority', 'track_to_add'])}
         if not self.plugin_conf.get('filter', None) and \
                 config_tags.isdisjoint(sup_tags):
             self.log.error('Found no config for %s plugin! '
@@ -83,7 +84,7 @@ class Tags(Plugin):
     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)
+                       self, config_tags & Tags.supported_tags)
         tags = config_tags & Tags.supported_tags
         self.player.needed_tags |= tags
 
@@ -98,13 +99,15 @@ class Tags(Plugin):
     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:
-            self.player.find(self.plugin_conf['filter'])
+            if self.plugin_conf['filter']:
+                self.player.find(self.plugin_conf['filter'])
         except CommandError:
             raise PluginException('Badly formated filter in tags plugin configuration: "%s"'
                                   % self.plugin_conf['filter'])