From df92bfb7c0e48d27bc1490b35b9683aa5611ed51 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Wed, 7 Dec 2022 06:05:34 -0400 Subject: don't expose/show coverArtDate without cover art --- src/data/things/track.js | 21 +++++++++++++++------ src/page/track.js | 1 + 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/data/things/track.js b/src/data/things/track.js index d2930ff..0842bf2 100644 --- a/src/data/things/track.js +++ b/src/data/things/track.js @@ -164,17 +164,26 @@ export class Track extends Thing { update: {validate: isDate}, expose: { - dependencies: ['albumData', 'dateFirstReleased'], + dependencies: [ + 'albumData', + 'coverArtistContribsByRef', + 'dateFirstReleased', + 'hasCoverArt', + ], transform: (coverArtDate, { albumData, + coverArtistContribsByRef, dateFirstReleased, + hasCoverArt, [Track.instance]: track, }) => - coverArtDate ?? - dateFirstReleased ?? - Track.findAlbum(track, albumData)?.trackArtDate ?? - Track.findAlbum(track, albumData)?.date ?? - null, + (Track.hasCoverArt(track, albumData, coverArtistContribsByRef, hasCoverArt) + ? coverArtDate ?? + dateFirstReleased ?? + Track.findAlbum(track, albumData)?.trackArtDate ?? + Track.findAlbum(track, albumData)?.date ?? + null + : null), }, }, diff --git a/src/page/track.js b/src/page/track.js index c283aa3..94c9c40 100644 --- a/src/page/track.js +++ b/src/page/track.js @@ -265,6 +265,7 @@ export function write(track, {wikiData}) { date: language.formatDate(track.date), }), + cover && track.coverArtDate && +track.coverArtDate !== +track.date && language.$('releaseInfo.artReleased', { -- cgit 1.3.0-6-gf8a5