X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Fcrop.py;h=7efb5b5491d7e40927ab87a025093967e5b0cd37;hb=1c01e4a7aa37eeef825c6918fc90b154a7f4ccc7;hp=d4df0c3211abc7acc1b728265f074adba7c2a99d;hpb=6893eb469c11924c9480b15385cedaf37908dd02;p=mpd-sima.git

diff --git a/sima/plugins/internal/crop.py b/sima/plugins/internal/crop.py
index d4df0c3..7efb5b5 100644
--- a/sima/plugins/internal/crop.py
+++ b/sima/plugins/internal/crop.py
@@ -1,11 +1,29 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """Crops playlist
 """
 
-# standart library import
+# standard library import
 #from select import select
 
-# third parties componants
+# third parties components
 
 # local import
 from ...lib.plugin import Plugin
@@ -20,21 +38,30 @@ class Crop(Plugin):
         self.target = None
         if not self.plugin_conf:
             return
-        target = self.plugin_conf.get('consume', None)
+        target = self.plugin_conf.get('consume')
         if not target:
             return
-        if not target.isdigit():
+        try:
+            if int(target) < 0:
+                self.log.info('Negative value for consume, not cropping')
+                return
+        except ValueError:
             self.log.warning('Bad value for consume, '
-                    'expecting an integer, not "{}"'.format(target))
+                             'expecting an integer, not "%s"', target)
         else:
             self.target = int(target)
+            self.log.debug('Cropping at 15')
 
-    def callback_playlist(self):
+    def callback_next_song(self):
         if not self.target:
             return
+        if not self._Plugin__daemon.enabled:
+            self.log.debug('Queueing disabled, not cropping')
+            return False
         player = self._Plugin__daemon.player
-        while player.currentsong().pos > self.target:
+        if player.currentsong().pos > self.target:
             self.log.debug('cropping playlist')
+        while player.currentsong().pos > self.target:
             player.remove()