X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Ftags.py;h=5ea4726837d2462917fd0c4c028e418b5d13e775;hb=e4dc436d9891dd6f7b80c8d60d45bbc39b7c67d3;hp=5cad0e821652069a0a057eb1374c1211a17d6df2;hpb=2e12fc88352c4538a463b3fb02611eca3f601d5a;p=mpd-sima.git diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py index 5cad0e8..5ea4726 100644 --- 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