diff --git a/picard/album.py b/picard/album.py index ba6a43821..221f4b8c5 100644 --- a/picard/album.py +++ b/picard/album.py @@ -643,7 +643,7 @@ class Album(DataObject, MetadataItem): self._files_count += 1 if new_album: self.update(update_tracks=False) - self.add_metadata_images([file]) + self.add_metadata_images_from_children([file]) def remove_file(self, track, file, new_album=True): self._files_count -= 1 diff --git a/picard/cluster.py b/picard/cluster.py index 21202935c..fcc909f4b 100644 --- a/picard/cluster.py +++ b/picard/cluster.py @@ -130,7 +130,7 @@ class Cluster(FileList): def _update_related_album(self, added_files=None, removed_files=None): if self.related_album: if added_files: - self.related_album.add_metadata_images(added_files) + self.related_album.add_metadata_images_from_children(added_files) if removed_files: self.related_album.remove_metadata_images(removed_files) self.related_album.update() @@ -149,7 +149,7 @@ class Cluster(FileList): self.files.extend(added_files) self.update(signal=False) if self.can_show_coverart: - self.add_metadata_images(added_files) + self.add_metadata_images_from_children(added_files) self.item.add_files(added_files) if new_album: self._update_related_album(added_files=added_files) diff --git a/picard/item.py b/picard/item.py index 3d7c30d74..ce713eedf 100644 --- a/picard/item.py +++ b/picard/item.py @@ -216,7 +216,7 @@ class MetadataItem(Item): return changed - def add_metadata_images(self, added_sources): + def add_metadata_images_from_children(self, added_sources): """Add the images in the metadata of `added_sources` to the metadata. Args: @@ -239,7 +239,7 @@ class MetadataItem(Item): This method will iterate over all children and completely rebuild `self.metadata.images`. Whenever possible the more specific functions - `add_metadata_images` or `remove_metadata_images` should be used. + `add_metadata_images_from_children` or `remove_metadata_images` should be used. Returns: bool: True, if images where changed, False otherwise diff --git a/picard/track.py b/picard/track.py index c7012063b..ffe0b02e3 100644 --- a/picard/track.py +++ b/picard/track.py @@ -152,7 +152,7 @@ class Track(DataObject, FileListItem): self.orig_metadata.images = ImageList() self.files.append(file) self.update_file_metadata(file) - self.add_metadata_images([file]) + self.add_metadata_images_from_children([file]) self.album.add_file(self, file, new_album=new_album) file.metadata_images_changed.connect(self.update_metadata_images) run_file_post_addition_to_track_processors(self, file) diff --git a/test/test_imagelist.py b/test/test_imagelist.py index 8897db9c3..887891546 100644 --- a/test/test_imagelist.py +++ b/test/test_imagelist.py @@ -233,7 +233,7 @@ class AddMetadataImagesTest(PicardTestCase): cluster.files = [self.test_files[0]] self.assertTrue(cluster.update_metadata_images_from_children()) cluster.files += self.test_files[1:] - self.assertTrue(cluster.add_metadata_images(self.test_files[1:])) + self.assertTrue(cluster.add_metadata_images_from_children(self.test_files[1:])) self.assertEqual(set(self.test_images), set(cluster.metadata.images)) self.assertFalse(cluster.metadata.has_common_images) @@ -241,14 +241,14 @@ class AddMetadataImagesTest(PicardTestCase): cluster = Cluster('Test') cluster.files = self.test_files self.assertTrue(cluster.update_metadata_images_from_children()) - self.assertFalse(cluster.add_metadata_images([self.test_files[1]])) + self.assertFalse(cluster.add_metadata_images_from_children([self.test_files[1]])) self.assertEqual(set(self.test_images), set(cluster.metadata.images)) def test_add_nothing(self): cluster = Cluster('Test') cluster.files = self.test_files self.assertTrue(cluster.update_metadata_images_from_children()) - self.assertFalse(cluster.add_metadata_images([])) + self.assertFalse(cluster.add_metadata_images_from_children([])) class ImageListTest(PicardTestCase):