Fixed sqlite sqlite3.OperationalError VACUUM Error

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

diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py
index 50d2b81f632072f966526de7a5bde33d56dd537a..2ff88d2224f7c59f7fb8b88296207bd9ff82a0b7 100644 (file)
--- a/sima/lib/webserv.py
+++ b/sima/lib/webserv.py
@@ -112,7 +112,11 @@ class WebService(Plugin):
             * not blacklisted
         """
         artist = tracks[0].artist
-        black_list = self.player.queue + self.to_add
+        # In random play mode use complete playlist to filter
+        if self.player.playmode.get('random'):
+            black_list = self.player.playlist + self.to_add
+        else:
+            black_list = self.player.queue + self.to_add
         not_in_hist = list(set(tracks) - set(self.get_history(artist=artist)))
         if self.plugin_conf.get('queue_mode') != 'top' and not not_in_hist:
             self.log.debug('All tracks already played for "%s"', artist)
@@ -195,7 +199,11 @@ class WebService(Plugin):
         if not self.player.playlist:
             return
         history = list(self.history)
-        history = self.player.queue + history
+        # In random play mode use complete playlist to filter
+        if self.player.playmode.get('random'):
+            history = self.player.playlist + history
+        else:
+            history = self.player.queue + history
         history = deque(history)
         last_trk = history.popleft() # remove
         extra_arts = list()
@@ -266,7 +274,11 @@ class WebService(Plugin):
         if not ret:
             self.log.warning('Got nothing from music library.')
             return []
-        queued_artists = MetaContainer([trk.Artist for trk in self.player.queue])
+        # In random play mode use complete playlist to filter
+        if self.player.playmode.get('random'):
+            queued_artists = MetaContainer([trk.Artist for trk in self.player.playlist])
+        else:
+            queued_artists = MetaContainer([trk.Artist for trk in self.player.queue])
         self.log.trace('Already queued: {}'.format(queued_artists))
         self.log.trace('Candidate: {}'.format(ret))
         if ret & queued_artists:
@@ -317,13 +329,15 @@ class WebService(Plugin):
             album_to_queue = str()
             random.shuffle(albums_not_in_hist)
             for album in albums_not_in_hist:
-                tracks = self.player.find_album(artist, album)
-                # Look if one track of the album is already queued
-                # Good heuristic, at least enough to guess if the whole album is
-                # already queued.
-                if tracks[0] in self.player.queue:
-                    self.log.debug('"%s" already queued, skipping!', tracks[0].album)
+                # Controls the album found is not already queued
+                if album in {t.album for t in self.player.queue}:
+                    self.log.debug('"%s" already queued, skipping!', album)
                     continue
+                # In random play mode use complete playlist to filter
+                if self.player.playmode.get('random'):
+                    if album in {t.album for t in self.player.playlist}:
+                        self.log.debug('"%s" already in playlist, skipping!', album)
+                        continue
                 album_to_queue = album
             if not album_to_queue:
                 self.log.info('No album found for "%s"', artist)