Code convention cleanup (pylint)

[mpd-sima.git] / sima / plugins / internal / crop.py

diff --git a/sima/plugins/internal/crop.py b/sima/plugins/internal/crop.py
index 5ac8f0f84d6693e1e19c5cebf315a1c302842571..af6b3175d5203829568e44d27bf309a87a7938fc 100644 (file)
--- a/sima/plugins/internal/crop.py
+++ b/sima/plugins/internal/crop.py
@@ -1,4 +1,22 @@
 # -*- 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
 """
 
@@ -17,22 +35,31 @@ class Crop(Plugin):
     """
     def __init__(self, daemon):
         super().__init__(daemon)
+        self.daemon = daemon
         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
-        player = self._Plugin__daemon.player
+        if not self.daemon.enabled:
+            self.log.debug('Queueing disabled, not cropping')
+            return False
+        player = self.daemon.player
         if player.currentsong().pos > self.target:
             self.log.debug('cropping playlist')
         while player.currentsong().pos > self.target: