From 5aa6ec2f4b449797fbe8269c0d8d7da66bd2c9bc Mon Sep 17 00:00:00 2001 From: kaliko Date: Fri, 15 May 2020 18:10:08 +0200 Subject: [PATCH] Get rid of inefficient log string formatting --- sima/core.py | 2 +- sima/lib/plugin.py | 3 +-- sima/lib/webserv.py | 34 ++++++++++++++--------------- sima/plugins/contrib/placeholder.py | 4 ++-- sima/plugins/core/uniq.py | 2 +- sima/plugins/internal/crop.py | 2 +- sima/plugins/internal/lastfm.py | 4 ++-- sima/plugins/internal/random.py | 4 ++-- sima/utils/config.py | 4 ++-- 9 files changed, 29 insertions(+), 30 deletions(-) diff --git a/sima/core.py b/sima/core.py index 4596115..27735bd 100644 --- a/sima/core.py +++ b/sima/core.py @@ -118,7 +118,7 @@ class Sima(Daemon): while True: tmp = sleepfor.pop(0) sleepfor.append(tmp) - self.log.info('Trying to reconnect in {:>4d} seconds'.format(tmp)) + self.log.info('Trying to reconnect in %4d seconds', tmp) time.sleep(tmp) try: self.player.connect() diff --git a/sima/lib/plugin.py b/sima/lib/plugin.py index 8057d86..f61cb72 100644 --- a/sima/lib/plugin.py +++ b/sima/lib/plugin.py @@ -65,8 +65,7 @@ class Plugin: if not self.plugin_conf: self.plugin_conf = {'priority': '80'} #if self.plugin_conf: - # self.log.debug('Got config for {0}: {1}'.format(self, - # self.plugin_conf)) + # self.log.debug('Got config for %s: ùs', self, self.plugin_conf) @property def priority(self): diff --git a/sima/lib/webserv.py b/sima/lib/webserv.py index 44131d4..f72215c 100644 --- a/sima/lib/webserv.py +++ b/sima/lib/webserv.py @@ -71,7 +71,7 @@ class WebService(Plugin): self._flush_cache() wrapper = {'track': self._track, 'top': self._top, - 'album': self._album,} + 'album': self._album} self.queue_mode = wrapper.get(self.plugin_conf.get('queue_mode')) self.ws = None @@ -81,11 +81,11 @@ class WebService(Plugin): """ name = self.__class__.__name__ if isinstance(self._cache, dict): - self.log.info('{0}: Flushing cache!'.format(name)) + self.log.info('%s: Flushing cache!', name) else: - self.log.info('{0}: Initialising cache!'.format(name)) + self.log.info('%s: Initialising cache!', name) self._cache = {'asearch': dict(), - 'tsearch': dict(),} + 'tsearch': dict()} def _cleanup_cache(self): """Avoid bloated cache @@ -111,6 +111,7 @@ class WebService(Plugin): * not in history * not already in the queue * not blacklisted + Then add to candidates in self.to_add """ artist = tracks[0].artist # In random play mode use complete playlist to filter @@ -125,7 +126,7 @@ class WebService(Plugin): candidate = [] for trk in [_ for _ in not_in_hist if _ not in black_list]: # Should use albumartist heuristic as well - if self.plugin_conf.getboolean('single_album'): # pylint: disable=no-member + if self.plugin_conf.getboolean('single_album'): # pylint: disable=no-member if (trk.album == self.player.current.album or trk.album in [tr.album for tr in black_list]): self.log.debug('Found unplayed track ' + @@ -177,21 +178,21 @@ class WebService(Plugin): # initialize artists deque list to construct from DB as_art = deque() as_artists = self.ws.get_similar(artist=artist) - self.log.debug('Requesting {} for {!r}'.format(self.ws.name, artist)) + self.log.debug('Requesting %s for %r', self.ws.name, artist) try: [as_art.append(art) for art in as_artists] except WSNotFound as err: - self.log.warning('{}: {}'.format(self.ws.name, err)) + self.log.warning('%s: %s', self.ws.name, err) if artist.mbid: self.log.debug('Trying without MusicBrainzID') try: return self.ws_similar_artists(Artist(name=artist.name)) except WSNotFound as err: - self.log.debug('{}: {}'.format(self.ws.name, err)) + self.log.debug('%s: %s', self.ws.name, err) except WSError as err: - self.log.warning('{}: {}'.format(self.ws.name, err)) + self.log.warning('%s: %s', self.ws.name, err) if as_art: - self.log.debug('Fetched {} artist(s)'.format(len(as_art))) + self.log.debug('Fetched %d artist(s)', len(as_art)) return as_art def get_recursive_similar_artist(self): @@ -222,7 +223,7 @@ class WebService(Plugin): self.log.debug('EXTRA ARTS: %s', '/'.join(map(str, extra_arts))) for artist in extra_arts: self.log.debug('Looking for artist similar ' - 'to "{}" as well'.format(artist)) + 'to "%s" as well', artist) similar = self.ws_similar_artists(artist=artist) if not similar: continue @@ -292,7 +293,7 @@ class WebService(Plugin): ret = ret - MetaContainer([current.Artist]) # Move around similars items to get in unplayed|not recently played # artist first. - self.log.info('Got {} artists in library'.format(len(ret))) + self.log.info('Got %d artists in library', len(ret)) candidates = self._get_artists_list_reorg(list(ret)) if candidates: self.log.info(' / '.join(map(str, candidates))) @@ -363,8 +364,8 @@ class WebService(Plugin): nbtracks_target = self.plugin_conf.getint('track_to_add') # pylint: disable=no-member for artist in artists: if len(self.to_add) == nbtracks_target: - return True - self.log.info('Looking for a top track for {0}'.format(artist)) + return + self.log.info('Looking for a top track for %s', artist) titles = deque() try: titles = [t for t in self.ws.get_toptrack(artist)] @@ -372,9 +373,8 @@ class WebService(Plugin): self.log.warning('%s: %s', self.ws.name, err) for trk in titles: found = self.player.search_track(artist, trk.title) - random.shuffle(found) if found: - self.log.debug('%s', found[0]) + random.shuffle(found) if self.filter_track(found): break @@ -412,7 +412,7 @@ class WebService(Plugin): artists = self.get_local_similar_artists() self.find_top(artists) for track in self.to_add: - self.log.info('{1} candidates: {0!s}'.format(track, self.ws.name)) + self.log.info('%s candidates: %s', self.ws.name, track) def callback_need_track(self): self._cleanup_cache() diff --git a/sima/plugins/contrib/placeholder.py b/sima/plugins/contrib/placeholder.py index c03eb91..bd4f19c 100644 --- a/sima/plugins/contrib/placeholder.py +++ b/sima/plugins/contrib/placeholder.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013, 2014 kaliko +# Copyright (c) 2013, 2014, 2020 kaliko # # This file is part of sima # @@ -34,7 +34,7 @@ class PlaceHolder(Plugin): def callback_player(self): #self.log.info(self.plugin_conf) - #self.log.debug('{0} contrib plugin!!!'.format(self)) + #self.log.debug('%s contrib plugin!!!', self) pass diff --git a/sima/plugins/core/uniq.py b/sima/plugins/core/uniq.py index 5a74170..292de6f 100644 --- a/sima/plugins/core/uniq.py +++ b/sima/plugins/core/uniq.py @@ -71,7 +71,7 @@ class Uniq(Plugin): self.log.warning(' '.join(channels)) def sub_chan(self): - self.log.debug('Registering as {}'.format(self.chan)) + self.log.debug('Registering as %s', self.chan) try: self.player.subscribe(self.chan) self._registred = True diff --git a/sima/plugins/internal/crop.py b/sima/plugins/internal/crop.py index 59e45c2..3f987ce 100644 --- a/sima/plugins/internal/crop.py +++ b/sima/plugins/internal/crop.py @@ -50,7 +50,7 @@ class Crop(Plugin): 'expecting an integer, not "%s"', target) else: self.target = int(target) - self.log.debug('Cropping at 15') + self.log.debug('Cropping at %s', self.target) def callback_next_song(self): if not self.target: diff --git a/sima/plugins/internal/lastfm.py b/sima/plugins/internal/lastfm.py index 613ddc1..81a2b1c 100644 --- a/sima/plugins/internal/lastfm.py +++ b/sima/plugins/internal/lastfm.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013, 2014 kaliko +# Copyright (c) 2013, 2014, 2020 kaliko # # This file is part of sima # @@ -44,7 +44,7 @@ class Lastfm(WebService): persitent_cache = daemon.config.getboolean('lastfm', 'cache') if persitent_cache: CacheController.CACHE_ANYWAY = True - self.log.debug('Persistant cache enabled in {}'.format(join(vardir, 'http', 'LastFM'))) + self.log.debug('Persistant cache enabled in %s', join(vardir, 'http', 'LastFM')) SimaFM.cache = FileCache(join(vardir, 'http', 'LastFM')) self.ws = SimaFM() diff --git a/sima/plugins/internal/random.py b/sima/plugins/internal/random.py index 936294c..148138b 100644 --- a/sima/plugins/internal/random.py +++ b/sima/plugins/internal/random.py @@ -83,12 +83,12 @@ class Random(Plugin): for art in artists: if self.filtered_artist(art): continue - self.log.debug('Random art: {}'.format(art)) + self.log.debug('Random art: %s', art) trks = self.player.find_tracks(Artist(art)) if trks: trk = random.choice(trks) self.candidates.append(trk) - self.log.info('Random candidate ({}): {}'.format(self.mode, trk)) + self.log.info('Random candidate (%s): %s', self.mode, trk) if len(self.candidates) >= target: break return self.candidates diff --git a/sima/utils/config.py b/sima/utils/config.py index c7dbab6..2778422 100644 --- a/sima/utils/config.py +++ b/sima/utils/config.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2015, 2019 kaliko +# Copyright (c) 2009-2015, 2019-2020 kaliko # Copyright (c) 2019 sacha # # This file is part of sima @@ -130,7 +130,7 @@ class ConfMan(object): # CONFIG MANAGER CLASS # Create directories data_dir = self.config['sima']['var_dir'] if not isdir(data_dir): - self.log.trace('Creating "{}"'.format(data_dir)) + self.log.trace('Creating "%s"', data_dir) makedirs(data_dir) chmod(data_dir, 0o700) -- 2.39.5