src/layers/dedupe.py

@@ -12,27 +12,20 @@ class Dedupe(Layer):
     def _process(self, left: Root):
         right = self.other
         existing_artists = right.by_name()
-        pruned_artists = list()
         for artist in left:
             artist_name = artist.name
             if artist_name in existing_artists:
-                pruned_albums = self.prune_artist(artist, right[artist_name])
+                self.prune_artist(artist, right[artist_name])
                 if len(artist.contents) == 0:
-                    pruned_artists.append(artist_name)
+                    left.prune(artist_name)
                     self.log.info('PRN', f"Pruned artist: {artist_name}")
-                else:
-                    for album_name in pruned_albums:
-                        self.log.info('PRN', f"Pruned album: {album_name}")
             else:
                 continue # todo: fuzzy matching
-        [left.prune(artist) for artist in pruned_artists]
 
-    @staticmethod
-    def prune_artist(left: Artist, right: Artist):
+    def prune_artist(self, left: Artist, right: Artist):
         existing_albums = right.by_name()
-        pruned_albums = list()
-        for album_name in existing_albums:
-            if album_name in left.by_name():
+        for album in left:
+            album_name = album.name
+            if album_name in existing_albums:
                 left.prune(album_name)
-                pruned_albums.append(album_name)
-        return pruned_albums
+                self.log.info('PRN', f"Pruned album: {album_name}")