Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous listing fixes #494

Merged
merged 3 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/content/dependencies/listArtistsByDuration.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {sortAlphabetically, sortByCount} from '#sort';
import {filterByCount, stitchArrays} from '#sugar';
import {filterByCount, stitchArrays, unique} from '#sugar';
import {getTotalDuration} from '#wiki-data';

export default {
Expand All @@ -17,10 +17,12 @@ export default {

const durations =
artists.map(artist =>
getTotalDuration([
...(artist.tracksAsArtist ?? []),
...(artist.tracksAsContributor ?? []),
], {originalReleasesOnly: true}));
getTotalDuration(
unique([
...(artist.tracksAsArtist ?? []),
...(artist.tracksAsContributor ?? []),
]),
{originalReleasesOnly: true}));

filterByCount(artists, durations);
sortByCount(artists, durations, {greatestFirst: true});
Expand Down
152 changes: 76 additions & 76 deletions src/content/dependencies/listArtistsByGroup.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import {sortAlphabetically} from '#sort';
import {empty, filterMultipleArrays, stitchArrays, unique} from '#sugar';
import {getArtistNumContributions} from '#wiki-data';
import {
empty,
filterByCount,
filterMultipleArrays,
stitchArrays,
transposeArrays,
} from '#sugar';

export default {
contentDependencies: ['generateListingPage', 'linkArtist', 'linkGroup'],
Expand All @@ -15,29 +20,52 @@ export default {
sortAlphabetically(
sprawl.artistData.filter(artist => !artist.isAlias));

const groups =
const interestingGroups =
sprawl.wikiInfo.divideTrackListsByGroups;

if (empty(groups)) {
return {spec, artists};
if (empty(interestingGroups)) {
return {spec};
}

const artistGroups =
// We don't actually care about *which* things belong to each group, only
// how many belong to each group. So we'll just compute a list of all the
// (interesting) groups that each of each artists' things belongs to.
const artistThingGroups =
artists.map(artist =>
unique(
unique([
...artist.albumsAsAny,
...artist.tracksAsAny.map(track => track.album),
]).flatMap(album => album.groups)))

const artistsByGroup =
groups.map(group =>
artists.filter((artist, index) => artistGroups[index].includes(group)));

filterMultipleArrays(groups, artistsByGroup,
(group, artists) => !empty(artists));

return {spec, groups, artistsByGroup};
([...artist.albumsAsAny.map(album => album.groups),
...artist.tracksAsAny.map(track => track.album.groups)])
.map(groups => groups
.filter(group => interestingGroups.includes(group))));

const [artistsByGroup, countsByGroup] =
transposeArrays(interestingGroups.map(group => {
const counts =
artistThingGroups
.map(thingGroups => thingGroups
.filter(thingGroups => thingGroups.includes(group))
.length);

const filteredArtists = artists.slice();

filterByCount(filteredArtists, counts);

return [filteredArtists, counts];
}));

const groups = interestingGroups;

filterMultipleArrays(
groups,
artistsByGroup,
countsByGroup,
(_group, artists, _counts) => !empty(artists));

return {
spec,
groups,
artistsByGroup,
countsByGroup,
};
},

relations(relation, query) {
Expand All @@ -46,12 +74,6 @@ export default {
relations.page =
relation('generateListingPage', query.spec);

if (query.artists) {
relations.artistLinks =
query.artists
.map(artist => relation('linkArtist', artist));
}

if (query.artistsByGroup) {
relations.groupLinks =
query.groups
Expand All @@ -69,65 +91,43 @@ export default {
data(query) {
const data = {};

if (query.artists) {
data.counts =
query.artists
.map(artist => getArtistNumContributions(artist));
}

if (query.artistsByGroup) {
data.groupDirectories =
query.groups
.map(group => group.directory);

data.countsByGroup =
query.artistsByGroup
.map(artists => artists
.map(artist => getArtistNumContributions(artist)));
query.countsByGroup;
}

return data;
},

generate(data, relations, {language}) {
return (
(relations.artistLinksByGroup
? relations.page.slots({
type: 'chunks',

showSkipToSection: true,
chunkIDs:
data.groupDirectories
.map(directory => `contributed-to-${directory}`),

chunkTitles:
relations.groupLinks.map(groupLink => ({
group: groupLink,
})),

chunkRows:
stitchArrays({
artistLinks: relations.artistLinksByGroup,
counts: data.countsByGroup,
}).map(({artistLinks, counts}) =>
stitchArrays({
link: artistLinks,
count: counts,
}).map(({link, count}) => ({
artist: link,
contributions: language.countContributions(count, {unit: true}),
}))),
})
: relations.page.slots({
type: 'rows',
rows:
stitchArrays({
link: relations.artistLinks,
count: data.counts,
}).map(({link, count}) => ({
artist: link,
contributions: language.countContributions(count, {unit: true}),
})),
})));
},
generate: (data, relations, {language}) =>
relations.page.slots({
type: 'chunks',

showSkipToSection: true,
chunkIDs:
data.groupDirectories
.map(directory => `contributed-to-${directory}`),

chunkTitles:
relations.groupLinks.map(groupLink => ({
group: groupLink,
})),

chunkRows:
stitchArrays({
artistLinks: relations.artistLinksByGroup,
counts: data.countsByGroup,
}).map(({artistLinks, counts}) =>
stitchArrays({
link: artistLinks,
count: counts,
}).map(({link, count}) => ({
artist: link,
contributions: language.countContributions(count, {unit: true}),
}))),
}),
};
3 changes: 2 additions & 1 deletion src/content/dependencies/listTracksByDate.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export default {

chunks:
chunkByProperties(
sortAlbumsTracksChronologically(trackData.slice()),
sortAlbumsTracksChronologically(
trackData.filter(track => track.date)),
['album', 'date']),
};
},
Expand Down
2 changes: 1 addition & 1 deletion src/listing-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ listingSpec.push({
contentFunction: 'listArtistsByDuration',
});

// TODO: hide if no groups...
// TODO: hide if divideTrackListsByGroups empty...
listingSpec.push({
directory: 'artists/by-group',
stringsKey: 'listArtists.byGroup',
Expand Down