From bfe08bc930c8b19bb440f668692acaf72d562be5 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 3 Jun 2023 14:34:15 -0300 Subject: content: generateArtistInfoPage: total duration paragraph --- src/content/dependencies/generateArtistInfoPage.js | 48 +++++++++++----------- 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'src/content') diff --git a/src/content/dependencies/generateArtistInfoPage.js b/src/content/dependencies/generateArtistInfoPage.js index 8cddfe44..73fc8711 100644 --- a/src/content/dependencies/generateArtistInfoPage.js +++ b/src/content/dependencies/generateArtistInfoPage.js @@ -1,12 +1,8 @@ -import { - accumulateSum, - empty, - filterProperties, - unique, -} from '../../util/sugar.js'; +import {empty, filterProperties, unique} from '../../util/sugar.js'; import { chunkByProperties, + getTotalDuration, sortAlbumsTracksChronologically, } from '../../util/wiki-data.js'; @@ -113,7 +109,7 @@ export default { .map(({album, date, chunk}) => ({ albumLink: relation('linkAlbum', album), date: +date, - duration: accumulateSum(chunk.map(track => track.duration)), + duration: getTotalDuration(chunk), entries: chunk .map(entry => filterProperties(entry, [ @@ -248,9 +244,15 @@ export default { }, data(artist) { - return { - name: artist.name, - }; + const data = {}; + + data.name = artist.name; + + const allTracks = unique([...artist.tracksAsArtist, ...artist.tracksAsContributor]); + data.totalTrackCount = allTracks.length; + data.totalDuration = getTotalDuration(allTracks, {originalReleasesOnly: true}); + + return data; }, generate(data, relations, {html, language}) { @@ -325,6 +327,17 @@ export default { title: language.$('artistPage.trackList.title'), }), + data.totalDuration > 0 && + html.tag('p', + language.$('artistPage.contributedDurationLine', { + artist: data.name, + duration: + language.formatDuration(data.totalDuration, { + approximate: data.totalTrackCount > 1, + unit: true, + }), + })), + html.tag('dl', sec.tracks.chunks.map(({albumLink, date, duration, entries}) => [ html.tag('dt', @@ -464,8 +477,6 @@ export function write(artist, {wikiData}) { key, }); - const totalDuration = getTotalDuration(allTracks.filter(t => !t.originalReleaseTrack)); - const countGroups = (things) => { const usedGroups = things.flatMap( (thing) => thing.groups || thing.album?.groups || []); @@ -730,19 +741,6 @@ export function write(artist, {wikiData}) { {id: 'tracks', class: ['content-heading']}, language.$('artistPage.trackList.title')), - totalDuration > 0 && - html.tag('p', - language.$('artistPage.contributedDurationLine', { - artist: artist.name, - duration: language.formatDuration( - totalDuration, - { - approximate: true, - unit: true, - } - ), - })), - !empty(musicGroups) && html.tag('p', language.$('artistPage.musicGroupsLine', { -- cgit 1.3.0-6-gf8a5