diff options
Diffstat (limited to 'src/content/dependencies')
8 files changed, 47 insertions, 47 deletions
diff --git a/src/content/dependencies/generateArtistGroupContributionsInfo.js b/src/content/dependencies/generateArtistGroupContributionsInfo.js index f84d00de..3e0cd1d2 100644 --- a/src/content/dependencies/generateArtistGroupContributionsInfo.js +++ b/src/content/dependencies/generateArtistGroupContributionsInfo.js @@ -36,7 +36,7 @@ export default { for (const track of filteredTracks) { for (const group of track.album.groups) { groupToCountMap.set(group, groupToCountMap.get(group) + 1); - if (track.duration && track.originalReleaseTrack === null) { + if (track.duration && track.mainReleaseTrack === null) { groupToDurationMap.set(group, groupToDurationMap.get(group) + track.duration); groupToDurationCountMap.set(group, groupToDurationCountMap.get(group) + 1); } diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunk.js b/src/content/dependencies/generateArtistInfoPageTracksChunk.js index b42e4165..f6d70901 100644 --- a/src/content/dependencies/generateArtistInfoPageTracksChunk.js +++ b/src/content/dependencies/generateArtistInfoPageTracksChunk.js @@ -40,7 +40,7 @@ export default { contribs .filter(contrib => contrib.countInDurationTotals) .map(contrib => contrib.thing) - .filter(track => track.isOriginalRelease) + .filter(track => track.isMainRelease) .filter(track => track.duration > 0)); data.duration = diff --git a/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js b/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js index 96976826..ba3005e2 100644 --- a/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js +++ b/src/content/dependencies/generateArtistInfoPageTracksChunkItem.js @@ -80,7 +80,7 @@ export default { query.track.duration, rerelease: - query.track.isRerelease, + query.track.isSecondaryRelease, contribAnnotations: (query.displayedContributions diff --git a/src/content/dependencies/generateGroupGalleryPage.js b/src/content/dependencies/generateGroupGalleryPage.js index 79746cd0..206c495d 100644 --- a/src/content/dependencies/generateGroupGalleryPage.js +++ b/src/content/dependencies/generateGroupGalleryPage.js @@ -86,7 +86,7 @@ export default { data.numAlbums = albums.length; data.numTracks = tracks.length; - data.totalDuration = getTotalDuration(tracks, {originalReleasesOnly: true}); + data.totalDuration = getTotalDuration(tracks, {mainReleasesOnly: true}); data.gridNames = albums.map(album => album.name); data.gridDurations = albums.map(album => getTotalDuration(album.tracks)); diff --git a/src/content/dependencies/generateTrackArtistCommentarySection.js b/src/content/dependencies/generateTrackArtistCommentarySection.js index 399c804a..63c4e93d 100644 --- a/src/content/dependencies/generateTrackArtistCommentarySection.js +++ b/src/content/dependencies/generateTrackArtistCommentarySection.js @@ -13,7 +13,7 @@ export default { query: (track) => ({ otherRereleasesWithCommentary: track.otherReleases - .filter(track => !track.isOriginalRelease) + .filter(track => !track.isMainRelease) .filter(track => !empty(track.commentary)), }), @@ -21,14 +21,14 @@ export default { contentHeading: relation('generateContentHeading'), - originalReleaseTrackLink: - (track.isRerelease - ? relation('linkTrack', track.originalReleaseTrack) + mainReleaseTrackLink: + (track.isSecondaryRelease + ? relation('linkTrack', track.mainReleaseTrack) : null), - originalReleaseArtistCommentaryEntries: - (track.isRerelease - ? track.originalReleaseTrack.commentary + mainReleaseArtistCommentaryEntries: + (track.isSecondaryRelease + ? track.mainReleaseTrack.commentary .map(entry => relation('generateCommentaryEntry', entry)) : null), @@ -48,22 +48,22 @@ export default { name: track.name, - isRerelease: - track.isRerelease, + isSecondaryRelease: + track.isSecondaryRelease, - originalReleaseName: - (track.isRerelease - ? track.originalReleaseTrack.name + mainReleaseName: + (track.isSecondaryRelease + ? track.mainReleaseTrack.name : null), - originalReleaseAlbumName: - (track.isRerelease - ? track.originalReleaseTrack.album.name + mainReleaseAlbumName: + (track.isSecondaryRelease + ? track.mainReleaseTrack.album.name : null), - originalReleaseAlbumColor: - (track.isRerelease - ? track.originalReleaseTrack.album.color + mainReleaseAlbumColor: + (track.isSecondaryRelease + ? track.mainReleaseTrack.album.color : null), otherReleaseAlbumNames: @@ -84,7 +84,7 @@ export default { title: language.$('misc.artistCommentary'), }), - data.isRerelease && + data.isSecondaryRelease && html.tags([ html.tag('p', {class: ['drop', 'commentary-drop']}, {[html.onlyIfSiblings]: true}, @@ -93,29 +93,29 @@ export default { const workingOptions = {}; workingOptions.album = - relations.originalReleaseTrackLink.slots({ + relations.mainReleaseTrackLink.slots({ content: - data.originalReleaseAlbumName, + data.mainReleaseAlbumName, color: - data.originalReleaseAlbumColor, + data.mainReleaseAlbumColor, }); - if (data.name !== data.originalReleaseName) { + if (data.name !== data.mainReleaseName) { workingCapsule += '.namedDifferently'; workingOptions.name = - html.tag('i', data.originalReleaseName); + html.tag('i', data.mainReleaseName); } return language.$(workingCapsule, workingOptions); })), - relations.originalReleaseArtistCommentaryEntries, + relations.mainReleaseArtistCommentaryEntries, ]), html.tags([ - data.isRerelease && - !html.isBlank(relations.originalReleaseArtistCommentaryEntries) && + data.isSecondaryRelease && + !html.isBlank(relations.mainReleaseArtistCommentaryEntries) && html.tag('p', {class: ['drop', 'commentary-drop']}, {[html.onlyIfSiblings]: true}, diff --git a/src/content/dependencies/generateTrackInfoPage.js b/src/content/dependencies/generateTrackInfoPage.js index 9af85aac..1c349c2e 100644 --- a/src/content/dependencies/generateTrackInfoPage.js +++ b/src/content/dependencies/generateTrackInfoPage.js @@ -27,10 +27,10 @@ export default { extraDependencies: ['html', 'language'], query: (track) => ({ - originalReleaseTrack: - (track.isOriginalRelease + mainReleaseTrack: + (track.isMainRelease ? track - : track.originalReleaseTrack), + : track.mainReleaseTrack), }), relations: (relation, query, track) => ({ @@ -83,11 +83,11 @@ export default { referencedByTracksList: relation('generateTrackListDividedByGroups', - query.originalReleaseTrack.referencedByTracks), + query.mainReleaseTrack.referencedByTracks), sampledByTracksList: relation('generateTrackListDividedByGroups', - query.originalReleaseTrack.sampledByTracks), + query.mainReleaseTrack.sampledByTracks), flashesThatFeatureList: relation('generateTrackInfoPageFeaturedByFlashesList', track), diff --git a/src/content/dependencies/listGroupsByDuration.js b/src/content/dependencies/listGroupsByDuration.js index da2f26db..c79e1bc4 100644 --- a/src/content/dependencies/listGroupsByDuration.js +++ b/src/content/dependencies/listGroupsByDuration.js @@ -16,7 +16,7 @@ export default { groups.map(group => getTotalDuration( group.albums.flatMap(album => album.tracks), - {originalReleasesOnly: true})); + {mainReleasesOnly: true})); filterByCount(groups, durations); sortByCount(groups, durations, {greatestFirst: true}); diff --git a/src/content/dependencies/listTracksByDate.js b/src/content/dependencies/listTracksByDate.js index 0a2bfd6c..b2cba5e6 100644 --- a/src/content/dependencies/listTracksByDate.js +++ b/src/content/dependencies/listTracksByDate.js @@ -42,10 +42,10 @@ export default { query.chunks .map(({date}) => date), - rereleases: + secreleases: query.chunks.map(({chunk}) => chunk.map(track => - track.originalReleaseTrack !== null)), + track.mainReleaseTrack !== null)), }; }, @@ -65,20 +65,20 @@ export default { chunkRows: stitchArrays({ trackLinks: relations.trackLinks, - rereleases: data.rereleases, - }).map(({trackLinks, rereleases}) => + secreleases: data.secreleases, + }).map(({trackLinks, secreleases}) => stitchArrays({ trackLink: trackLinks, - rerelease: rereleases, - }).map(({trackLink, rerelease}) => - (rerelease + secrelease: secreleases, + }).map(({trackLink, secrelease}) => + (secrelease ? {stringsKey: 'rerelease', track: trackLink} : {track: trackLink}))), chunkRowAttributes: - data.rereleases.map(rereleases => - rereleases.map(rerelease => - (rerelease + data.secreleases.map(secreleases => + secreleases.map(secrelease => + (secrelease ? {class: 'rerelease'} : null))), }); |