Get rid of inefficient log string formatting

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

diff --git a/sima/plugins/internal/crop.py b/sima/plugins/internal/crop.py
index 1f8ab2c1936f9d39cd0c898d7a40e0c1973859f5..3f987ce7482190941e4c199a1fa9eb6f28e88a9a 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-2015, 2020 kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -31,30 +31,38 @@ from ...lib.plugin import Plugin
 class Crop(Plugin):
     """
     Crop playlist on next track
-    kinda MPD's consume
     """
     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 %s', self.target)
 
     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:
-            player.remove()
+            player.delete(0)
 
 
 # VIM MODLINE