X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Fplugins%2Finternal%2Fcrop.py;h=7efb5b5491d7e40927ab87a025093967e5b0cd37;hb=4354c875088ac413824ad881505676de417e19bf;hp=1f8ab2c1936f9d39cd0c898d7a40e0c1973859f5;hpb=24993cd99b847733894f57fd004ed52b5390244a;p=mpd-sima.git

diff --git a/sima/plugins/internal/crop.py b/sima/plugins/internal/crop.py
index 1f8ab2c..7efb5b5 100644
--- a/sima/plugins/internal/crop.py
+++ b/sima/plugins/internal/crop.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -38,18 +38,26 @@ 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_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
         if player.currentsong().pos > self.target:
             self.log.debug('cropping playlist')