Cleanup PlayerError exception wrapper

[mpd-sima.git] / sima / plugins / core / history.py

diff --git a/sima/plugins/core/history.py b/sima/plugins/core/history.py
index 6c3ad907ce6a5c19ed453f6a42dea50104656426..57b57bd7b24b19552bbdb6753ea9ef65c20beb17 100644 (file)
--- a/sima/plugins/core/history.py
+++ b/sima/plugins/core/history.py
@@ -28,6 +28,7 @@ from time import time
 # local import
 from ...lib.plugin import Plugin
 
+
 class History(Plugin):
     """
     History management
@@ -39,15 +40,21 @@ class History(Plugin):
     def shutdown(self):
         self.log.info('Cleaning database')
         self.sdb.purge_history()
-        self.sdb.clean_database()
+
+    def _h_tip(self):
+        hist = self.sdb.fetch_history()
+        if hist:
+            return hist[0]
+        return None
 
     def callback_player(self):
         current = self.player.current
-        last_hist = next(self.sdb.get_history(), None)
-        if last_hist and last_hist[3] == current.file:
-            return
         if not current:
-            self.log.debug('Cannot add "%s" to history (empty or missing file)', current)
+            if self.player.state == 'play':
+                self.log.debug('Cannot add "%s" to history (empty or missing file)', current)
+            return
+        last_hist = self._h_tip()
+        if last_hist and last_hist == current:
             return
         self.log.debug('add history: "%s"', current)
         self.sdb.add_history(current)