Merge pull request #2619 from zas/PICARD-3049

PICARD-3049: improve debugging and do not append the same image twice to FileList

Author: zas

picard/ui/coverartbox/__init__.py

@@ -256,16 +256,12 @@ def _try_load_remote_image(self, url, data):
         config = get_config()
         if config.setting['load_image_behavior'] == 'replace':
             mode = CoverArtSetterMode.REPLACE
-            debug_info = "Replacing with dropped %r in %r"
         else:
             mode = CoverArtSetterMode.APPEND
-            debug_info = "Appending dropped %r to %r"
 
         setter = CoverArtSetter(mode, coverartimage, self.item)
-        if not setter.set_coverart():
-            debug_info = "Dropping %r to %r is not handled"
+        setter.set_coverart()
 
-        log.debug(debug_info, coverartimage, self.item)
         return coverartimage
 
     def choose_local_file(self):

picard/ui/coverartbox/coverartsetter.py

@@ -38,6 +38,7 @@
 from contextlib import ExitStack
 from enum import IntEnum
 
+from picard import log
 from picard.album import Album
 from picard.cluster import Cluster
 from picard.file import File
@@ -65,17 +66,22 @@ def __init__(self, mode, coverartimage, source_obj):
             self.set_coverart = self.set_coverart_file
 
     def set_coverart(self):
+        log.debug("No set_coverart handler for %r", self.source_obj)
         return False
 
     def set_image(self, obj):
         if self.mode == CoverArtSetterMode.REPLACE:
             obj.metadata.images.strip_front_images()
+            log.debug("Replacing images with %r in %r", self.coverartimage, obj)
+        else:
+            log.debug("Appending image %r to %r", self.coverartimage, obj)
 
         obj.metadata.images.append(self.coverartimage)
         obj.metadata_images_changed.emit()
 
     def set_coverart_album(self):
         album = self.source_obj
+        log.debug("set_coverart_album %r", album)
         with ExitStack() as stack:
             stack.enter_context(album.suspend_metadata_images_update)
             self.set_image(album)
@@ -100,6 +106,7 @@ def iter_file_parents(file):
 
     def set_coverart_filelist(self):
         filelist = self.source_obj
+        log.debug("set_coverart_filelist %r", filelist)
         parents = set()
         with ExitStack() as stack:
             stack.enter_context(filelist.suspend_metadata_images_update)
@@ -111,7 +118,6 @@ def set_coverart_filelist(self):
                 self.set_image(file)
                 file.update(signal=False)
             for parent in parents:
-                self.set_image(parent)
                 if isinstance(parent, Album):
                     parent.update(update_tracks=False)
                 else:
@@ -121,6 +127,7 @@ def set_coverart_filelist(self):
 
     def set_coverart_file(self):
         file = self.source_obj
+        log.debug("set_coverart_file %r", file)
         self.set_image(file)
         file.update()
         return True