content: generateAlbumArtworkColumn: fix separating attaching arts

1 files changed, 35 insertions, 19 deletions

diff --git a/src/content/dependencies/generateAlbumArtworkColumn.js b/src/content/dependencies/generateAlbumArtworkColumn.js
index e6762463..150d3b6e 100644
--- a/src/content/dependencies/generateAlbumArtworkColumn.js
+++ b/src/content/dependencies/generateAlbumArtworkColumn.js
@@ -2,37 +2,53 @@ export default {
   contentDependencies: ['generateAlbumArtInfoBox', 'generateCoverArtwork'],
   extraDependencies: ['html'],
 
-  relations: (relation, album) => ({
-    firstCover:
+  query: (album) => ({
+    nonAttachingArtworkIndex:
       (album.hasCoverArt
-        ? relation('generateCoverArtwork', album.coverArtworks[0])
+        ? album.coverArtworks.findIndex((artwork, index) =>
+            index > 1 &&
+            !artwork.attachAbove)
         : null),
+  }),
+
+  relations: (relation, query, album) => ({
+    firstCovers:
+      (album.hasCoverArt && query.nonAttachingArtworkIndex >= 1
+        ? album.coverArtworks
+            .slice(0, query.nonAttachingArtworkIndex)
+            .map(artwork => relation('generateCoverArtwork', artwork))
+
+     : album.hasCoverArt
+        ? album.coverArtworks
+            .map(artwork => relation('generateCoverArtwork', artwork))
 
-    restCovers:
-      (album.hasCoverArt
-        ? album.coverArtworks.slice(1).map(artwork =>
-            relation('generateCoverArtwork', artwork))
         : []),
 
     albumArtInfoBox:
       relation('generateAlbumArtInfoBox', album),
+
+    restCovers:
+      (album.hasCoverArt && query.nonAttachingArtworkIndex >= 1
+        ? album.coverArtworks
+            .slice(query.nonAttachingArtworkIndex)
+            .map(artwork => relation('generateCoverArtwork', artwork))
+
+        : []),
   }),
 
-  generate: (relations, {html}) =>
-    html.tags([
-      relations.firstCover?.slots({
+  generate(relations, {html}) {
+    for (const cover of [...relations.firstCovers, ...relations.restCovers]) {
+      cover.setSlots({
         showOriginDetails: true,
         showArtTagDetails: true,
         showReferenceDetails: true,
-      }),
+      });
+    }
 
+    return html.tags([
+      relations.firstCovers,
       relations.albumArtInfoBox,
-
-      relations.restCovers.map(cover =>
-        cover.slots({
-          showOriginDetails: true,
-          showArtTagDetails: true,
-          showReferenceDetails: true,
-        })),
-    ]),
+      relations.restCovers,
+    ]);
+  },
 };