From a9334c430b9c2b69f0d1d2eba976043b486fab11 Mon Sep 17 00:00:00 2001 From: Florrie Date: Wed, 3 Jun 2020 15:31:10 -0300 Subject: headers 8ay8ee --- upd8.js | 751 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 408 insertions(+), 343 deletions(-) (limited to 'upd8.js') diff --git a/upd8.js b/upd8.js index 7720c5e..bb5e22d 100644 --- a/upd8.js +++ b/upd8.js @@ -852,37 +852,42 @@ async function writeAlbumPage(album) { const listTag = getAlbumListTag(album); await writePage([C.ALBUM_DIRECTORY, album.directory], album.name, fixWS` -

- ${generateSidebarForAlbum(album)} + -

-

-

${album.name}

-

- ${album.artists && `By ${getArtistString(album.artists)}.
`} - ${album.coverArtists && `Cover art by ${joinNoOxford(album.coverArtists.map(({ who, what }) => fixWS` - ${who}${what && ` (${getContributionString({what})})`} - `))}.
`} - Released ${getDateString(album)}. - ${+album.artDate !== +album.date && `
Art released ${getDateString({date: album.artDate})}.`} -

- ${album.urls.length && `

Listen on ${joinNoOxford(album.urls.map(url => fancifyURL(url, {album: true})), 'or')}.

`} - <${listTag}> - ${album.tracks.map(track => fixWS` -

- ${track.name} - ${track.artists !== album.artists && fixWS` - by ${getArtistString(track.artists)} - `} -

- `).join('\n')} - - ${album.commentary && fixWS` -

Artist commentary:

-

- ${transformMultiline(album.commentary)} -

- `} +

+ +

+

+

${album.name}

+

+ ${album.artists && `By ${getArtistString(album.artists)}.
`} + ${album.coverArtists && `Cover art by ${joinNoOxford(album.coverArtists.map(({ who, what }) => fixWS` + ${who}${what && ` (${getContributionString({what})})`} + `))}.
`} + Released ${getDateString(album)}. + ${+album.artDate !== +album.date && `
Art released ${getDateString({date: album.artDate})}.`} +

+ ${album.urls.length && `

Listen on ${joinNoOxford(album.urls.map(url => fancifyURL(url, {album: true})), 'or')}.

`} + <${listTag}> + ${album.tracks.map(track => fixWS` +

+ ${track.name} + ${track.artists !== album.artists && fixWS` + by ${getArtistString(track.artists)} + `} +

+ `).join('\n')} + + ${album.commentary && fixWS` +

Artist commentary:

+

+ ${transformMultiline(album.commentary)} +

+ `} +

`); @@ -896,88 +901,93 @@ async function writeTrackPage(track) { const flashesThatFeature = getFlashesThatFeature(track); await writePage([C.TRACK_DIRECTORY, track.directory], track.name, fixWS` -

- ${generateSidebarForAlbum(track.album, track)} + -

-

-

${track.name}

-

- By ${getArtistString(track.artists)}.
- ${track.coverArtists && `Cover art by ${joinNoOxford(track.coverArtists.map(({ who, what }) => fixWS` - ${who}${what && ` (${getContributionString({what})})`} - `))}.
`} - Released ${getDateString(track)}. - ${+track.artDate !== +track.date && `
Art released ${getDateString({date: track.artDate})}.`} -

-

Listen on ${joinNoOxford(track.urls.map(fancifyURL), 'or')}.

- ${track.contributors.length && fixWS` -

Contributors:

-

${artistNames.includes(who) - ? `${who}` - : who - } ${what && `(${getContributionString({what})})`}

- `} - ${tracksReferenced.length && fixWS` -

Tracks that ${track.name} references:

-

- ${track.name} - by ${getArtistString(track.artists)} -

- `} - ${tracksThatReference.length && fixWS` -

Tracks that reference ${track.name}:

-

Official:

- ${track.name} - by ${getArtistString(track.artists)} -

Fandom:

- ${track.name} - by ${getArtistString(track.artists)} -

- `} - ${flashesThatFeature.length && fixWS` -

Flashes & games that feature ${track.name}:

-

${getFlashLinkHTML(flash)}

- `} - ${track.lyrics && fixWS` -

Lyrics:

-

- ${transformMultiline(track.lyrics)} -

- `} - ${track.commentary && fixWS` -

Artist commentary:

-

- ${transformMultiline(track.commentary)} -

- `} +

+ +

+

+

${track.name}

+

+ By ${getArtistString(track.artists)}.
+ ${track.coverArtists && `Cover art by ${joinNoOxford(track.coverArtists.map(({ who, what }) => fixWS` + ${who}${what && ` (${getContributionString({what})})`} + `))}.
`} + Released ${getDateString(track)}. + ${+track.artDate !== +track.date && `
Art released ${getDateString({date: track.artDate})}.`} +

+

Listen on ${joinNoOxford(track.urls.map(fancifyURL), 'or')}.

+ ${track.contributors.length && fixWS` +

Contributors:

+

${artistNames.includes(who) + ? `${who}` + : who + } ${what && `(${getContributionString({what})})`}

+ `} + ${tracksReferenced.length && fixWS` +

Tracks that ${track.name} references:

+

+ ${track.name} + by ${getArtistString(track.artists)} +

+ `} + ${tracksThatReference.length && fixWS` +

Tracks that reference ${track.name}:

+

Official:

+ ${track.name} + by ${getArtistString(track.artists)} +

Fandom:

+ ${track.name} + by ${getArtistString(track.artists)} +

+ `} + ${flashesThatFeature.length && fixWS` +

Flashes & games that feature ${track.name}:

+

${getFlashLinkHTML(flash)}

+ `} + ${track.lyrics && fixWS` +

Lyrics:

+

+ ${transformMultiline(track.lyrics)} +

+ `} + ${track.commentary && fixWS` +

Artist commentary:

+

+ ${transformMultiline(track.commentary)} +

+ `} +

`); @@ -1166,92 +1176,100 @@ async function writeFlashPage(flash) { ); await writePage([C.FLASH_DIRECTORY, kebab], flash.name, fixWS` -

-

(Home)

-

-

Flashes & Games

-

Side 1 (Acts 1-5)

Side 2 (Acts 6-7)

Outside Canon (Misc. Games)

${act}

- ${f.name} -

-

- ${chronologyButtons(flash, { - headingWord: 'flash/game', - sourceData: flashData, - filters: [ - { - mapProperty: 'contributors', - toArtist: ({ who }) => who - } - ] - })} +

+

+ Home + / Flashes & Games + / ${flash.name} +

+

+ ${chronologyButtons(flash, { + headingWord: 'flash/game', + sourceData: flashData, + filters: [ + { + mapProperty: 'contributors', + toArtist: ({ who }) => who + } + ] + })} +

-

-

${flash.name}

-

-

Released ${getDateString(flash)}.

- ${flash.page && `

Play on Homestuck (${isNaN(Number(flash.page)) ? 'secret page' : `page ${flash.page}`}).

`} - ${flash.contributors.length && fixWS` -

Contributors:

-

${artistNames.includes(who) - ? `${who}` - : who - } ${what && `(${getContributionString({what})})`}

+

+

Flashes & Games

+

Side 1 (Acts 1-5)

Side 2 (Acts 6-7)

Outside Canon (Misc. Games)

${act}

+ ${f.name} +

- `} -

Tracks featured in ${flash.name.replace(/\.$/, '')}:

-

- ${neeeighm} - by ${getArtistString(track.artists)} -
${name} by ${getArtistString(who)}

+

+

${flash.name}

+

+

Released ${getDateString(flash)}.

+ ${flash.page && `

Play on Homestuck (${isNaN(Number(flash.page)) ? 'secret page' : `page ${flash.page}`}).

`} + ${flash.contributors.length && fixWS` +

Contributors:

+

${artistNames.includes(who) + ? `${who}` + : who + } ${what && `(${getContributionString({what})})`}

+ `} +

Tracks featured in ${flash.name.replace(/\.$/, '')}:

+

+ ${neeeighm} + by ${getArtistString(track.artists)} +
${ref}
${name} by ${getArtistString(who)}
${ref}

+ }).join('\n')} + +

`); @@ -1356,85 +1374,106 @@ function writeListingPages() { return progressPromiseAll(`Writing listing pages.`, [ writePage([C.LISTING_DIRECTORY], `Listings Index`, fixWS` - ${generateSidebarForListings(listingDescriptors)} -

-

Listings

-

Feel free to explore any of the listings linked in the sidebar!

+ +

+ +

+

Listings

+

Feel free to explore any of the listings linked in the sidebar!

+

`), writePage([C.LISTING_DIRECTORY, 'all-commentary'], 'All Commentary', fixWS` - ${generateSidebarForListings(listingDescriptors, 'all-commentary')} -

-

All Commentary

-

${getWordCount(albumData.reduce((acc, a) => acc + [a, ...a.tracks].filter(x => x.commentary).map(x => x.commentary).join(' '), ''))} words, in all.
Jump to a particular album:

-

+ +

+

All Commentary

+

${getWordCount(albumData.reduce((acc, a) => acc + [a, ...a.tracks].filter(x => x.commentary).map(x => x.commentary).join(' '), ''))} words, in all.
Jump to a particular album:

+

+ ${album.name} + (${(() => { + const things = [album, ...album.tracks]; + const cThings = things.filter(x => x.commentary); + // const numStr = album.tracks.every(t => t.commentary) ? 'full commentary' : `${cThings.length} entries`; + const numStr = `${cThings.length}/${things.length} entries`; + return `${numStr}; ${getWordCount(cThings.map(x => x.commentary).join(' '))} words`; + })()}) +

${C.sortByDate(albumData.slice()) - .filter(album => [album, ...album.tracks].some(x => x.commentary)) - .map(album => fixWS` -

- ${album.name} - (${(() => { - const things = [album, ...album.tracks]; - const cThings = things.filter(x => x.commentary); - // const numStr = album.tracks.every(t => t.commentary) ? 'full commentary' : `${cThings.length} entries`; - const numStr = `${cThings.length}/${things.length} entries`; - return `${numStr}; ${getWordCount(cThings.map(x => x.commentary).join(' '))} words`; - })()}) -

+ .map(album => [album, ...album.tracks]) + .filter(x => x.some(y => y.commentary)) + .map(([ album, ...tracks ]) => fixWS` +

${album.name}

+ ${album.commentary && fixWS` +

+ ${transformMultiline(album.commentary)} +

+ `} + ${tracks.filter(t => t.commentary).map(track => fixWS` +

${track.name}

+

+ ${transformMultiline(track.commentary)} +

+ `).join('\n')} `) .join('\n') } -

- ${C.sortByDate(albumData.slice()) - .map(album => [album, ...album.tracks]) - .filter(x => x.some(y => y.commentary)) - .map(([ album, ...tracks ]) => fixWS` -

${album.name}

- ${album.commentary && fixWS` -

- ${transformMultiline(album.commentary)} -

- `} - ${tracks.filter(t => t.commentary).map(track => fixWS` -

${track.name}

-

- ${transformMultiline(track.commentary)} -

- `).join('\n')} - `) - .join('\n') - } +

`), writePage([C.LISTING_DIRECTORY, 'random'], 'Random Pages', fixWS` - ${generateSidebarForListings(listingDescriptors, 'random')} -

-

Random Pages

-

Choose a link to go to a random page in that category or album! If your browser doesn't support relatively modern JavaScript or you've disabled it, these links won't work - sorry.

-

Miscellaneous:

${category.name}: (Random Album, Random Track)

${album.name}

+ +

+ +

+

Random Pages

+

Choose a link to go to a random page in that category or album! If your browser doesn't support relatively modern JavaScript or you've disabled it, these links won't work - sorry.

+

Miscellaneous:

${category.name}: (Random Album, Random Track)

${album.name}

+

`), @@ -1445,39 +1484,60 @@ function writeListingPages() { function writeListingPage(directoryParts, title, items, listingDescriptors) { return writePage([C.LISTING_DIRECTORY, ...directoryParts], title, fixWS` - ${generateSidebarForListings(listingDescriptors, directoryParts)} -

-

${title}

- ${typeof items === 'string' ? items : fixWS` -

- ${items.join('\n')} - - `} + +

+ +

+

${title}

+ ${typeof items === 'string' ? items : fixWS` +

+ ${items.join('\n')} + + `} +

`); } +function generateHeaderForListings(listingDescriptors, currentDirectoryParts) { + return fixWS` +

+ Home + / Listings + ${currentDirectoryParts && `/ ` + ( + (currentDirectoryParts === 'all-commentary') ? `All Commentary` : + (currentDirectoryParts === 'random') ? `Random Pages` : + listingDescriptors.find(([ ldDirectoryParts ]) => ldDirectoryParts === currentDirectoryParts)[1] + ) + ``} +

+ `; +} + function generateSidebarForListings(listingDescriptors, currentDirectoryParts) { return fixWS` -

-

(Home)

-

-

Listings

-

- ${ldTitle} -
- All Commentary -
- Random Pages +
Listings
+
- + ${ldTitle}
-

+ `).join('\n')} +

+ All Commentary +

+

+ Random Pages +

+ `; } @@ -1631,64 +1691,27 @@ function chronologyButtons(currentTrack, { const heading = `${th(index + 1)} ${headingWord} by ${artist}`; - return parts.length ? fixWS` -

- ${heading}
- (${parts.join(', ')}) -

- ` : fixWS` -

${heading}

+ return fixWS` +

+ ${heading} + ${parts.length && `(${parts.join(', ')})`} +

`; }).filter(Boolean).join('\n'); } -function generateSidebarForAlbum(album, currentTrack = null) { - const listTag = getAlbumListTag(album); +function generateHeaderForAlbum(album, currentTrack = null) { return fixWS` -

(Home)

- -

-

${album.name}

- <${listTag}> - ${album.tracks.map(track => fixWS` -

${track.name}

- `).join('\n')} - - ${(album.tracks.length > 1 || currentTrack) && `

`} - ${album.tracks.length > 1 && fixWS` -

- Random track -

- `} - ${currentTrack === null && chronologyButtons(album, { - headingWord: 'cover art', - sourceData: justEverythingSortedByArtDateMan, - filters: [ - { - mapProperty: 'coverArtists', - toArtist: ({ who }) => who - } - ] - })} - ${currentTrack && fixWS` - ${chronologyButtons(currentTrack, { - headingWord: 'track', - filters: [ - { - mapProperty: 'artists', - toArtist: artist => artist - }, - { - mapProperty: 'contributors', - toArtist: ({ who }) => who - } - ] - })} - ${chronologyButtons(currentTrack, { +

+ Home + / ${album.name} + ${currentTrack && `/ ${currentTrack.name}`} + + ${album.tracks.length > 1 && `(Random track)`} + +

+

+ ${currentTrack === null && chronologyButtons(album, { headingWord: 'cover art', sourceData: justEverythingSortedByArtDateMan, filters: [ @@ -1698,7 +1721,45 @@ function generateSidebarForAlbum(album, currentTrack = null) { } ] })} - `} + ${currentTrack && fixWS` + ${chronologyButtons(currentTrack, { + headingWord: 'track', + sourceData: allTracks, + filters: [ + { + mapProperty: 'artists', + toArtist: artist => artist + }, + { + mapProperty: 'contributors', + toArtist: ({ who }) => who + } + ] + })} + ${chronologyButtons(currentTrack, { + headingWord: 'cover art', + sourceData: justEverythingSortedByArtDateMan, + filters: [ + { + mapProperty: 'coverArtists', + toArtist: ({ who }) => who + } + ] + })} + `} +

+ `; +} + +function generateSidebarForAlbum(album, currentTrack = null) { + const listTag = getAlbumListTag(album); + return fixWS` +

${album.name}

+ <${listTag}> + ${album.tracks.map(track => fixWS` +

${track.name}

+ `).join('\n')} + ` } @@ -1837,6 +1898,12 @@ async function main() { artistNames = C.getArtistNames(albumData, flashData); artistNames.sort((a, b) => a.toLowerCase() < b.toLowerCase() ? -1 : a.toLowerCase() > b.toLowerCase() ? 1 : 0); + officialAlbumData = albumData.filter(album => !album.isFanon); + fandomAlbumData = albumData.filter(album => album.isFanon); + justEverythingMan = C.sortByDate(albumData.concat(allTracks, flashData.filter(flash => !flash.act8r8k))); + justEverythingSortedByArtDateMan = C.sortByArtDate(justEverythingMan.slice()); + // console.log(JSON.stringify(justEverythingSortedByArtDateMan.map(getHrefOfAnythingMan), null, 2)); + { let buffer = []; const clearBuffer = function() { @@ -1859,6 +1926,10 @@ async function main() { } else if (entry.alias) { clearBuffer(); console.log(`\x1b[31mArtist "\x1b[1m${name}\x1b[0;31m" should be named "\x1b[1m${entry.alias}\x1b[0;31m"\x1b[0m`); + const where = justEverythingMan.filter(thing => [...thing.coverArtists || [], ...thing.contributors || []].some(({ who }) => who === name)); + for (const thing of where) { + console.log(`\x1b[31m- ` + (thing.album ? `(\x1b[1m${thing.album.name}\x1b[0;31m)` : '') + ` \x1b[1m${thing.name}\x1b[0m`); + } CR4SH = true; } else { buffer.push(entry); @@ -1874,12 +1945,6 @@ async function main() { } } - officialAlbumData = albumData.filter(album => !album.isFanon); - fandomAlbumData = albumData.filter(album => album.isFanon); - justEverythingMan = C.sortByDate(albumData.concat(allTracks, flashData.filter(flash => !flash.act8r8k))); - justEverythingSortedByArtDateMan = C.sortByArtDate(justEverythingMan.slice()); - // console.log(JSON.stringify(justEverythingSortedByArtDateMan.map(getHrefOfAnythingMan), null, 2)); - { const directories = []; for (const { directory, name } of albumData) { -- cgit 1.3.0-6-gf8a5