From 27d366fd2de98d816ef0698a1a6d5b4d59b388ca Mon Sep 17 00:00:00 2001
From: "(quasar) nebula"
Date: Thu, 5 May 2022 19:36:59 -0300
Subject: support albums and tracks without release dates
---
src/page/group.js | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
(limited to 'src/page/group.js')
diff --git a/src/page/group.js b/src/page/group.js
index c51f0e3..0a6cee1 100644
--- a/src/page/group.js
+++ b/src/page/group.js
@@ -4,10 +4,6 @@
import fixWS from 'fix-whitespace';
-import {
- UNRELEASED_TRACKS_DIRECTORY
-} from '../util/magic-constants.js';
-
import * as html from '../util/html.js';
import {
@@ -24,9 +20,9 @@ export function targets({wikiData}) {
export function write(group, {wikiData}) {
const { listingSpec, wikiInfo } = wikiData;
- const releasedAlbums = group.albums.filter(album => album.directory !== UNRELEASED_TRACKS_DIRECTORY);
- const releasedTracks = releasedAlbums.flatMap(album => album.tracks);
- const totalDuration = getTotalDuration(releasedTracks);
+ const { albums } = group;
+ const tracks = albums.flatMap(album => album.tracks);
+ const totalDuration = getTotalDuration(tracks);
const albumLines = group.albums.map(album => ({
album,
@@ -70,10 +66,14 @@ export function write(group, {wikiData}) {
}
${albumLines.map(({ album, otherGroup }) => {
- const item = strings('groupInfoPage.albumList.item', {
- year: album.date.getFullYear(),
- album: link.album(album)
- });
+ const item = (album.date
+ ? strings('groupInfoPage.albumList.item', {
+ year: album.date.getFullYear(),
+ album: link.album(album)
+ })
+ : strings('groupInfoPage.albumList.item.withoutYear', {
+ album: link.album(album)
+ }));
return html.tag('li', (otherGroup
? strings('groupInfoPage.albumList.item.withAccent', {
item,
@@ -127,8 +127,8 @@ export function write(group, {wikiData}) {
${strings('groupGalleryPage.title', {group: group.name})}
${
strings('groupGalleryPage.infoLine', {
- tracks: `${strings.count.tracks(releasedTracks.length, {unit: true})}`,
- albums: `${strings.count.albums(releasedAlbums.length, {unit: true})}`,
+ tracks: `${strings.count.tracks(tracks.length, {unit: true})}`,
+ albums: `${strings.count.albums(albums.length, {unit: true})}`,
time: `${strings.count.duration(totalDuration, {unit: true})}`
})
}
--
cgit 1.3.0-6-gf8a5