X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Ftags.py;h=949b3878a1c6ce47c6dd0c02f4d17cf0ee95f5fd;hb=f822f2e502b8ae6b1d20cf1d17db533e09b6c0b5;hp=1536c5ce2c87a91ba464861aa9a9d4b3ebef094a;hpb=35012360f9d528bca294f6bbe2ca3ad843d09630;p=mpd-sima.git

diff --git a/sima/plugins/internal/tags.py b/sima/plugins/internal/tags.py
index 1536c5c..949b387 100644
--- 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, AdvancedLookUp
-from ...lib.meta import Artist, Album
+from ...lib.plugin import AdvancedPlugin
+from ...lib.meta import Artist
 from ...utils.utils import PluginException
 
 
@@ -53,7 +53,7 @@ def forge_filter(cfg):
     return mpd_filter
 
 
-class Tags(Plugin, AdvancedLookUp):
+class Tags(AdvancedPlugin):
     """Add track based on tags content
     """
     supported_tags = {'comment', 'date', 'genre', 'label', 'originaldate'}
@@ -61,7 +61,6 @@ class Tags(Plugin, AdvancedLookUp):
 
     def __init__(self, daemon):
         super().__init__(daemon)
-        self.daemon = daemon
         self._control_conf()
         self.mpd_filter = forge_filter(self.plugin_conf)
         self._setup_tagsneeded()
@@ -111,36 +110,6 @@ class Tags(Plugin, AdvancedLookUp):
             raise PluginException('Badly formated filter in tags plugin configuration: "%s"'
                                   % self.plugin_conf['filter'])
 
-    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')
-        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)
-                continue
-            candidates.append(trk)
-            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')