Merge pull request metabrainz#451 from rahul-raturi/bugs

PICARD 780: CAA cover art provider runs even if cover art has already been loaded
sirusdas · Jan 3, 2016 · 055d7a5 · 055d7a5
2 parents d0d23aa + ae8e91e
commit 055d7a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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")