diff options
| -rw-r--r-- | src/page/album.js | 23 | ||||
| -rw-r--r-- | src/page/group.js | 247 | ||||
| -rw-r--r-- | src/page/index.js | 1 | ||||
| -rwxr-xr-x | src/upd8.js | 208 |
4 files changed, 264 insertions, 215 deletions
diff --git a/src/page/album.js b/src/page/album.js index bc1668a0..16da6021 100644 --- a/src/page/album.js +++ b/src/page/album.js @@ -1,27 +1,22 @@ // Album page specification. -// -// Also exports utility functions: -// - generateAlbumSidebar -// - generateAlbumNavLinks -// - generateAlbumChronologyLinks // Imports import fixWS from 'fix-whitespace'; import { - getAlbumCover, - getAlbumListTag, - getTotalDuration -} from '../util/wiki-data.js'; - -import { getLinkThemeString, getThemeString } from '../util/colors.js'; import * as html from '../util/html.js'; +import { + getAlbumCover, + getAlbumListTag, + getTotalDuration +} from '../util/wiki-data.js'; + // Page exports export function targets({wikiData}) { @@ -96,8 +91,8 @@ export function write(album, {wikiData}) { type: 'page', path: ['album', album.directory], page: ({ - chronologyLinks, fancifyURL, + generateChronologyLinks, generateCoverLink, getAlbumStylesheet, getArtistString, @@ -232,7 +227,7 @@ export function write(album, {wikiData}) { html: generateAlbumNavLinks(album, null, {strings}) } ], - content: html.tag('div', generateAlbumChronologyLinks(album, null, {chronologyLinks})) + content: html.tag('div', generateAlbumChronologyLinks(album, null, {generateChronologyLinks})) } }) }; @@ -240,7 +235,7 @@ export function write(album, {wikiData}) { return [page, data]; } -// Utility exports +// Utility functions export function generateAlbumSidebar(album, currentTrack, { fancifyURL, diff --git a/src/page/group.js b/src/page/group.js new file mode 100644 index 00000000..5db5a8ff --- /dev/null +++ b/src/page/group.js @@ -0,0 +1,247 @@ +// Group page specifications. + +// Imports + +import fixWS from 'fix-whitespace'; + +import { + UNRELEASED_TRACKS_DIRECTORY +} from '../util/magic-constants.js'; + +import { + getLinkThemeString, + getThemeString +} from '../util/colors.js'; + +import * as html from '../util/html.js'; + +import { + getTotalDuration, + sortByDate +} from '../util/wiki-data.js'; + +// Page exports + +export function targets({wikiData}) { + return wikiData.groupData; +} + +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 albumLines = group.albums.map(album => ({ + album, + otherGroup: album.groups.find(g => g !== group) + })); + + const infoPage = { + type: 'page', + path: ['groupInfo', group.directory], + page: ({ + generateInfoGalleryLinks, + generatePreviousNextLinks, + fancifyURL, + link, + strings, + transformMultiline + }) => ({ + title: strings('groupInfoPage.title', {group: group.name}), + theme: getThemeString(group.color), + + main: { + content: fixWS` + <h1>${strings('groupInfoPage.title', {group: group.name})}</h1> + ${group.urls.length && `<p>${ + strings('releaseInfo.visitOn', { + links: strings.list.or(group.urls.map(url => fancifyURL(url, {strings}))) + }) + }</p>`} + <blockquote> + ${transformMultiline(group.description)} + </blockquote> + <h2>${strings('groupInfoPage.albumList.title')}</h2> + <p>${ + strings('groupInfoPage.viewAlbumGallery', { + link: link.groupGallery(group, { + text: strings('groupInfoPage.viewAlbumGallery.link') + }) + }) + }</p> + <ul> + ${albumLines.map(({ album, otherGroup }) => { + const item = strings('groupInfoPage.albumList.item', { + year: album.date.getFullYear(), + album: link.album(album) + }); + return html.tag('li', (otherGroup + ? strings('groupInfoPage.albumList.item.withAccent', { + item, + accent: html.tag('span', + {class: 'other-group-accent'}, + strings('groupInfoPage.albumList.item.otherGroupAccent', { + group: link.groupInfo(otherGroup, {color: false}) + })) + }) + : item)); + }).join('\n')} + </ul> + ` + }, + + sidebarLeft: generateGroupSidebar(group, false, {link, strings, wikiData}), + nav: generateGroupNav(group, false, { + generateInfoGalleryLinks, + generatePreviousNextLinks, + link, + strings, + wikiData + }) + }) + }; + + const galleryPage = { + type: 'page', + path: ['groupGallery', group.directory], + page: ({ + generateInfoGalleryLinks, + generatePreviousNextLinks, + getAlbumGridHTML, + link, + strings + }) => ({ + title: strings('groupGalleryPage.title', {group: group.name}), + theme: getThemeString(group.color), + + main: { + classes: ['top-index'], + content: fixWS` + <h1>${strings('groupGalleryPage.title', {group: group.name})}</h1> + <p class="quick-info">${ + strings('groupGalleryPage.infoLine', { + tracks: `<b>${strings.count.tracks(releasedTracks.length, {unit: true})}</b>`, + albums: `<b>${strings.count.albums(releasedAlbums.length, {unit: true})}</b>`, + time: `<b>${strings.count.duration(totalDuration, {unit: true})}</b>` + }) + }</p> + ${wikiInfo.features.groupUI && wikiInfo.features.listings && html.tag('p', + {class: 'quick-info'}, + strings('groupGalleryPage.anotherGroupLine', { + link: link.listing(listingSpec.find(l => l.directory === 'groups/by-category'), { + text: strings('groupGalleryPage.anotherGroupLine.link') + }) + }) + )} + <div class="grid-listing"> + ${getAlbumGridHTML({ + entries: sortByDate(group.albums.map(item => ({item}))).reverse(), + details: true + })} + </div> + ` + }, + + sidebarLeft: generateGroupSidebar(group, true, {link, strings, wikiData}), + nav: generateGroupNav(group, true, { + generateInfoGalleryLinks, + generatePreviousNextLinks, + link, + strings, + wikiData + }) + }) + }; + + return [infoPage, galleryPage]; +} + +// Utility functions + +function generateGroupSidebar(currentGroup, isGallery, {link, strings, wikiData}) { + const { groupCategoryData, wikiInfo } = wikiData; + + if (!wikiInfo.features.groupUI) { + return null; + } + + const linkKey = isGallery ? 'groupGallery' : 'groupInfo'; + + return { + content: fixWS` + <h1>${strings('groupSidebar.title')}</h1> + ${groupCategoryData.map(category => + html.tag('details', { + open: category === currentGroup.category, + class: category === currentGroup.category && 'current' + }, [ + html.tag('summary', + {style: getLinkThemeString(category.color)}, + strings('groupSidebar.groupList.category', { + category: `<span class="group-name">${category.name}</span>` + })), + html.tag('ul', + category.groups.map(group => html.tag('li', + { + class: currentGroup && 'current', + style: getLinkThemeString(group.color) + }, + strings('groupSidebar.groupList.item', { + group: link[linkKey](group) + })))) + ])).join('\n')} + </dl> + ` + }; +} + +function generateGroupNav(currentGroup, isGallery, { + generateInfoGalleryLinks, + generatePreviousNextLinks, + link, + strings, + wikiData +}) { + const { groupData, wikiInfo } = wikiData; + + if (!wikiInfo.features.groupUI) { + return {simple: true}; + } + + const urlKey = isGallery ? 'localized.groupGallery' : 'localized.groupInfo'; + const linkKey = isGallery ? 'groupGallery' : 'groupInfo'; + + const infoGalleryLinks = generateInfoGalleryLinks(currentGroup, isGallery, { + linkKeyGallery: 'groupGallery', + linkKeyInfo: 'groupInfo' + }); + + const previousNextLinks = generatePreviousNextLinks(currentGroup, { + data: groupData, + linkKey + }); + + return { + links: [ + {toHome: true}, + wikiInfo.features.listings && + { + path: ['localized.listingIndex'], + title: strings('listingIndex.title') + }, + { + html: strings('groupPage.nav.group', { + group: link[linkKey](currentGroup, {class: 'current'}) + }) + }, + { + divider: false, + html: (previousNextLinks + ? `(${infoGalleryLinks}; ${previousNextLinks})` + : `(${previousNextLinks})`) + } + ] + }; +} diff --git a/src/page/index.js b/src/page/index.js index a37f8a90..e6565766 100644 --- a/src/page/index.js +++ b/src/page/index.js @@ -26,4 +26,5 @@ // pertain only to site page generation. export * as album from './album.js'; +export * as group from './group.js'; export * as track from './track.js'; diff --git a/src/upd8.js b/src/upd8.js index e199b1f7..b37dabd9 100755 --- a/src/upd8.js +++ b/src/upd8.js @@ -4640,42 +4640,6 @@ function generateChronologyLinks(currentThing, { }).filter(Boolean).join('\n'); } -function generateSidebarForGroup(currentGroup, isGallery, {link, strings, wikiData}) { - const { groupCategoryData, wikiInfo } = wikiData; - - if (!wikiInfo.features.groupUI) { - return null; - } - - const linkKey = isGallery ? 'groupGallery' : 'groupInfo'; - - return { - content: fixWS` - <h1>${strings('groupSidebar.title')}</h1> - ${groupCategoryData.map(category => - html.tag('details', { - open: category === currentGroup.category, - class: category === currentGroup.category && 'current' - }, [ - html.tag('summary', - {style: getLinkThemeString(category.color)}, - strings('groupSidebar.groupList.category', { - category: `<span class="group-name">${category.name}</span>` - })), - html.tag('ul', - category.groups.map(group => fixWS` - <li ${classes(group === currentGroup && 'current')} style="${getLinkThemeString(group.color)}">${ - strings('groupSidebar.groupList.item', { - group: link[linkKey](group) - }) - }</li> - `)) - ])).join('\n')} - </dl> - ` - }; -} - function generateInfoGalleryLinks(currentThing, isGallery, { link, strings, linkKeyGallery, @@ -4725,170 +4689,6 @@ function generatePreviousNextLinks(current, { ].filter(Boolean).join(', '); } -function generateNavForGroup(currentGroup, isGallery, {link, strings, wikiData}) { - const { groupData, wikiInfo } = wikiData; - - if (!wikiInfo.features.groupUI) { - return {simple: true}; - } - - const urlKey = isGallery ? 'localized.groupGallery' : 'localized.groupInfo'; - const linkKey = isGallery ? 'groupGallery' : 'groupInfo'; - - const infoGalleryLinks = generateInfoGalleryLinks(currentGroup, isGallery, { - link, strings, - linkKeyGallery: 'groupGallery', - linkKeyInfo: 'groupInfo' - }); - - const previousNextLinks = generatePreviousNextLinks(currentGroup, { - link, strings, - data: groupData, - linkKey - }); - - return { - links: [ - {toHome: true}, - wikiInfo.features.listings && - { - path: ['localized.listingIndex'], - title: strings('listingIndex.title') - }, - { - html: strings('groupPage.nav.group', { - group: link[linkKey](currentGroup, {class: 'current'}) - }) - }, - { - divider: false, - html: (previousNextLinks - ? `(${infoGalleryLinks}; ${previousNextLinks})` - : `(${previousNextLinks})`) - } - ] - }; -} - -function writeGroupPages({wikiData}) { - return wikiData.groupData.map(group => writeGroupPage(group, {wikiData})); -} - -function writeGroupPage(group, {wikiData}) { - const { 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 albumLines = group.albums.map(album => ({ - album, - otherGroup: album.groups.find(g => g !== group) - })); - - const infoPage = { - type: 'page', - path: ['groupInfo', group.directory], - page: ({ - link, - strings, - transformMultiline - }) => ({ - title: strings('groupInfoPage.title', {group: group.name}), - theme: getThemeString(group.color), - - main: { - content: fixWS` - <h1>${strings('groupInfoPage.title', {group: group.name})}</h1> - ${group.urls.length && `<p>${ - strings('releaseInfo.visitOn', { - links: strings.list.or(group.urls.map(url => fancifyURL(url, {strings}))) - }) - }</p>`} - <blockquote> - ${transformMultiline(group.description)} - </blockquote> - <h2>${strings('groupInfoPage.albumList.title')}</h2> - <p>${ - strings('groupInfoPage.viewAlbumGallery', { - link: link.groupGallery(group, { - text: strings('groupInfoPage.viewAlbumGallery.link') - }) - }) - }</p> - <ul> - ${albumLines.map(({ album, otherGroup }) => { - const item = strings('groupInfoPage.albumList.item', { - year: album.date.getFullYear(), - album: link.album(album) - }); - return html.tag('li', (otherGroup - ? strings('groupInfoPage.albumList.item.withAccent', { - item, - accent: html.tag('span', - {class: 'other-group-accent'}, - strings('groupInfoPage.albumList.item.otherGroupAccent', { - group: link.groupInfo(otherGroup, {color: false}) - })) - }) - : item)); - }).join('\n')} - </ul> - ` - }, - - sidebarLeft: generateSidebarForGroup(group, false, {link, strings, wikiData}), - nav: generateNavForGroup(group, false, {link, strings, wikiData}) - }) - }; - - const galleryPage = { - type: 'page', - path: ['groupGallery', group.directory], - page: ({ - getAlbumGridHTML, - link, - strings - }) => ({ - title: strings('groupGalleryPage.title', {group: group.name}), - theme: getThemeString(group.color), - - main: { - classes: ['top-index'], - content: fixWS` - <h1>${strings('groupGalleryPage.title', {group: group.name})}</h1> - <p class="quick-info">${ - strings('groupGalleryPage.infoLine', { - tracks: `<b>${strings.count.tracks(releasedTracks.length, {unit: true})}</b>`, - albums: `<b>${strings.count.albums(releasedAlbums.length, {unit: true})}</b>`, - time: `<b>${strings.count.duration(totalDuration, {unit: true})}</b>` - }) - }</p> - ${wikiInfo.features.groupUI && wikiInfo.features.listings && html.tag('p', - {class: 'quick-info'}, - strings('groupGalleryPage.anotherGroupLine', { - link: link.listing(listingSpec.find(l => l.directory === 'groups/by-category'), { - text: strings('groupGalleryPage.anotherGroupLine.link') - }) - }) - )} - <div class="grid-listing"> - ${getAlbumGridHTML({ - entries: sortByDate(group.albums.map(item => ({item}))).reverse(), - details: true - })} - </div> - ` - }, - - sidebarLeft: generateSidebarForGroup(group, true, {link, strings, wikiData}), - nav: generateNavForGroup(group, true, {link, strings, wikiData}) - }) - }; - - return [infoPage, galleryPage]; -} - // RIP toAnythingMan (previously getHrefOfAnythingMan), 2020-05-25<>2021-05-14. // ........Yet the function 8reathes life anew as linkAnythingMan! ::::) function linkAnythingMan(anythingMan, {link, wikiData, ...opts}) { @@ -5607,7 +5407,7 @@ async function main() { const buildDictionary = pageSpecs; const buildSteps = (writeAll - ? Object.values(buildDictionary) + ? Object.entries(buildDictionary) : (Object.entries(buildDictionary) .filter(([ flag ]) => writeFlags[flag]))); @@ -5800,6 +5600,12 @@ async function main() { wikiData }); + bound.generateInfoGalleryLinks = bindOpts(generateInfoGalleryLinks, { + [bindOpts.bindIndex]: 2, + link: bound.link, + strings + }); + bound.generatePreviousNextLinks = bindOpts(generatePreviousNextLinks, { link: bound.link, strings |