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 fd0656c8542395a819be38512e33364c5e903da3..af6b3175d5203829568e44d27bf309a87a7938fc 100644 (file)
--- 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
 #
@@ -35,6 +35,7 @@ class Crop(Plugin):
     """
     def __init__(self, daemon):
         super().__init__(daemon)
+        self.daemon = daemon
         self.target = None
         if not self.plugin_conf:
             return
@@ -47,7 +48,7 @@ class Crop(Plugin):
                 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')
@@ -55,7 +56,10 @@ class Crop(Plugin):
     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: