Fixed previous commit, cannot apply shuffle on MetaContainer

[mpd-sima.git] / sima / lib / plugin.py

diff --git a/sima/lib/plugin.py b/sima/lib/plugin.py
index c38683af971e6aad172fe87cbfbe20750be7499b..49cd7f155d9c0ee057e0353aef4e27cf4e28f10f 100644 (file)
--- a/sima/lib/plugin.py
+++ b/sima/lib/plugin.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-# Copyright (c) 2013-2015, 2020 kaliko <kaliko@azylum.org>
+# Copyright (c) 2013-2015, 2020-2021 kaliko <kaliko@azylum.org>

 #
 #  This file is part of sima
 #
 #
 #  This file is part of sima
 #


@@ -24,7 +24,7 @@ Plugin object to derive from
 import random
 
 from .track import Track
 import random
 
 from .track import Track

-from .meta import Album, Artist
+from .meta import Album, Artist, MetaContainer

 
 
 class Plugin:
 
 
 class Plugin:


@@ -82,50 +82,42 @@ class Plugin:
         Called when the daemon().run() is called and
         right after the player has connected successfully.
         """
         Called when the daemon().run() is called and
         right after the player has connected successfully.
         """

-        pass

 
     def callback_player(self):
         """
         Called on player changes, stopped, paused, skipped
         """
 
     def callback_player(self):
         """
         Called on player changes, stopped, paused, skipped
         """

-        pass

 
     def callback_player_database(self):
         """
         Called on player music library changes
         """
 
     def callback_player_database(self):
         """
         Called on player music library changes
         """

-        pass

 
     def callback_playlist(self):
         """
         Called on playlist changes
         Not returning data
         """
 
     def callback_playlist(self):
         """
         Called on playlist changes
         Not returning data
         """

-        pass

 
     def callback_next_song(self):
         """
         Could be use to scrobble, maintain an history…
         Not returning data,
         """
 
     def callback_next_song(self):
         """
         Could be use to scrobble, maintain an history…
         Not returning data,
         """

-        pass

 
     def callback_need_track(self):
         """
         Returns a list of Track objects to add
         """
 
     def callback_need_track(self):
         """
         Returns a list of Track objects to add
         """

-        pass

 
     def callback_need_track_fb(self):
         """
         Called when callback_need_track failled to find tracks to queue
         Returns a list of Track objects to add
         """
 
     def callback_need_track_fb(self):
         """
         Called when callback_need_track failled to find tracks to queue
         Returns a list of Track objects to add
         """

-        pass

 
     def shutdown(self):
         """Called on application shutdown"""
 
     def shutdown(self):
         """Called on application shutdown"""

-        pass

 
 
 class AdvancedPlugin(Plugin):
 
 
 class AdvancedPlugin(Plugin):


@@ -163,20 +155,20 @@ class AdvancedPlugin(Plugin):
         Move around items in alist in order to have first not recently
         played (or about to be played) artists.
 
         Move around items in alist in order to have first not recently
         played (or about to be played) artists.
 

-        :param list(str) alist: artist name list (Not an Artist object)
+        :param {Artist} alist: Artist objects list/container

         """
         """

-        queued_artist = {_.artist for _ in self.player.queue}
-        not_queued_artist = set(alist) - queued_artist
+        queued_artist = MetaContainer([Artist(_.artist) for _ in
+                                       self.player.queue if _.artist])
+        not_queued_artist = alist - queued_artist

         duration = self.main_conf.getint('sima', 'history_duration')
         hist = []
         duration = self.main_conf.getint('sima', 'history_duration')
         hist = []

-        for art in self.sdb.get_artists_history(alist,
-                                                duration=duration):
+        for art in self.sdb.get_artists_history(alist, duration=duration):

             if art not in hist:
                 if art not in queued_artist:
                     hist.insert(0, art)
                 else:
                     hist.append(art)
             if art not in hist:
                 if art not in queued_artist:
                     hist.insert(0, art)
                 else:
                     hist.append(art)

-        # Find not recently played (not in history)
+        # Find not recently played (not in history) & not in queue

         reorg = [art for art in not_queued_artist if art not in hist]
         reorg.extend(hist)
         return reorg
         reorg = [art for art in not_queued_artist if art not in hist]
         reorg.extend(hist)
         return reorg


@@ -218,11 +210,12 @@ class AdvancedPlugin(Plugin):
                                    album)
                     continue
             album_to_queue = album
                                    album)
                     continue
             album_to_queue = album

+            break

         if not album_to_queue:
             self.log.info('No album found for "%s"', artist)
             return None
         if not album_to_queue:
             self.log.info('No album found for "%s"', artist)
             return None

-        self.log.info('%s album candidate: %s - %s', self.__class__.__name__,
-                      artist, album_to_queue)
+        self.log.info('%s plugin chose album: %s - %s',
+                      self.__class__.__name__, artist, album_to_queue)

         return album_to_queue
 
     def filter_track(self, tracks, unplayed=False):
         return album_to_queue
 
     def filter_track(self, tracks, unplayed=False):