From ae8e91e8c168e5b8120596534aa3e53d5097e856 Mon Sep 17 00:00:00 2001 From: Rahul Raturi Date: Thu, 24 Dec 2015 17:19:38 +0530 Subject: [PATCH] PICARD 780:CAA cover art provider runs even if cover art has already been loaded --- picard/coverart/providers/__init__.py | 2 +- picard/coverart/providers/caa.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/picard/coverart/providers/__init__.py b/picard/coverart/providers/__init__.py index 088a4b2f88..7611559943 100644 --- a/picard/coverart/providers/__init__.py +++ b/picard/coverart/providers/__init__.py @@ -134,8 +134,8 @@ def queue_images(self): # CoverArtProvider.WAIT old = getattr(self, 'queue_downloads') #compat with old plugins if callable(old): - old() log.warning('CoverArtProvider: queue_downloads() was replaced by queue_images()') + return old() else: raise NotImplementedError diff --git a/picard/coverart/providers/caa.py b/picard/coverart/providers/caa.py index e0dd4af22f..c64d62ff17 100644 --- a/picard/coverart/providers/caa.py +++ b/picard/coverart/providers/caa.py @@ -246,7 +246,8 @@ def _has_suitable_artwork(self): def enabled(self): """Check if CAA artwork has to be downloaded""" - if not super(CoverArtProviderCaa, self).enabled(): + if not super(CoverArtProviderCaa, self).enabled() or \ + self.coverart.front_image_found: return False if self.restrict_types and not self.len_caa_types: log.debug("User disabled all Cover Art Archive types")