feat(*): add image grids for album and associated media displays

This commit is contained in:
Cory Dransfeldt 2025-05-24 17:19:30 -07:00
parent 9b4baad5fb
commit 36fbba761a
No known key found for this signature in database
53 changed files with 1179 additions and 764 deletions

View file

@ -9,7 +9,7 @@ SELECT
EXTRACT(EPOCH FROM a.release_date) AS release_timestamp,
json_build_object(
'title', a.name,
'image', CONCAT('/', df.filename_disk),
'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', COALESCE(a.release_link, ar.slug),
'alt', CONCAT(a.name, ' by ', ar.name_string),
'subtext', CONCAT(ar.name_string, '', TO_CHAR(a.release_date, 'Mon FMDD, YYYY'))
@ -18,5 +18,6 @@ FROM
albums a
LEFT JOIN directus_files df ON a.art = df.id
LEFT JOIN artists ar ON a.artist = ar.id
CROSS JOIN optimized_globals globals
WHERE
a.release_date IS NOT NULL;

View file

@ -6,10 +6,10 @@ SELECT
al.total_plays AS total_plays_raw,
ar.name_string AS artist_name,
ar.slug AS artist_url,
CONCAT('/', df_album.filename_disk) AS image,
CONCAT(globals.cdn_url, '/', df_album.filename_disk) AS image,
json_build_object(
'title', al.name,
'image', CONCAT('/', df_album.filename_disk),
'image', CONCAT(globals.cdn_url, '/', df_album.filename_disk),
'url', ar.slug,
'alt', CONCAT('Cover for ', al.name, ' by ', ar.name_string),
'subtext', CONCAT(to_char(al.total_plays, 'FM999,999,999,999'), ' plays')
@ -18,7 +18,7 @@ SELECT
'title', al.name,
'artist', ar.name_string,
'plays', to_char(al.total_plays, 'FM999,999,999,999'),
'image', CONCAT('/', df_album.filename_disk),
'image', CONCAT(globals.cdn_url, '/', df_album.filename_disk),
'url', ar.slug,
'year', al.release_year,
'alt', CONCAT('Cover for ', al.name, ' by ', ar.name_string)
@ -26,4 +26,5 @@ SELECT
FROM albums al
LEFT JOIN artists ar ON al.artist = ar.id
LEFT JOIN directus_files df_album ON al.art = df_album.id
GROUP BY al.id, ar.name_string, ar.slug, df_album.filename_disk;
CROSS JOIN optimized_globals globals
GROUP BY al.id, ar.name_string, ar.slug, df_album.filename_disk, globals.cdn_url;

View file

@ -14,13 +14,13 @@ SELECT
json_build_object('name', g.name, 'url', g.slug, 'emoji', g.emoji) AS genre,
ar.emoji,
ar.tattoo,
CONCAT('/', df.filename_disk) AS image,
CONCAT(globals.cdn_url, '/', df.filename_disk) AS image,
json_build_object(
'title', ar.name_string,
'image', CONCAT('/', df.filename_disk),
'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', ar.slug,
'alt', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string),
'subtext', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays')
'alt', CASE WHEN ar.total_plays > 0 THEN CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string) ELSE CONCAT('Artwork of ', ar.name_string) END,
'subtext', CASE WHEN ar.total_plays > 0 THEN CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays') ELSE NULL END
) AS grid,
json_build_object(
'title', ar.name_string,
@ -28,7 +28,7 @@ SELECT
'genre_url', g.slug,
'emoji', COALESCE(ar.emoji, g.emoji),
'plays', to_char(ar.total_plays, 'FM999,999,999,999'),
'image', CONCAT('/', df.filename_disk),
'image', CONCAT(globals.cdn_url, '/', df.filename_disk),
'url', ar.slug,
'alt', CONCAT(to_char(ar.total_plays, 'FM999,999,999,999'), ' plays of ', ar.name_string)
) AS table,
@ -41,15 +41,11 @@ SELECT
'art', df_album.filename_disk,
'grid', json_build_object(
'title', a.name,
'image', CONCAT('/', df_album.filename_disk),
'alt', CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name),
'subtext',
CASE
WHEN a.total_plays > 0
THEN CONCAT(a.release_year, '', to_char(a.total_plays, 'FM999,999,999,999'), ' plays')
ELSE CONCAT(a.release_year, '')
END
)
'image', CONCAT(globals.cdn_url, '/', df_album.filename_disk),
'alt', CASE WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name) ELSE CONCAT('Artwork for ', a.name) END,
'subtext', CASE WHEN a.total_plays > 0 THEN CONCAT(a.release_year, '', to_char(a.total_plays, 'FM999,999,999,999'), ' plays') ELSE a.release_year::text END
),
'type', 'albums'
)
ORDER BY a.release_year
)
@ -76,60 +72,127 @@ SELECT
) AS concerts,
(
SELECT json_agg(
json_build_object('title', b.title, 'author', b.author, 'url', b.slug)
json_build_object(
'title', b.title,
'author', b.author,
'url', b.slug,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'grid', json_build_object(
'title', NULL,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'alt', CONCAT('Cover for ', b.title, ' by ', b.author),
'subtext', CASE WHEN b.star_rating IS NOT NULL THEN b.star_rating ELSE NULL END,
'url', b.slug
),
'type', 'books'
)
ORDER BY b.title ASC
)
FROM books_artists ba
LEFT JOIN books b ON ba.books_id = b.id
LEFT JOIN directus_files df_book ON b.art = df_book.id
WHERE ba.artists_id = ar.id
AND LOWER(b.read_status) = 'finished'
) AS books,
(
SELECT json_agg(
json_build_object('title', m.title, 'year', m.year, 'url', m.slug)
ORDER BY m.year DESC
json_build_object(
'title', m.title,
'year', m.year,
'url', m.slug,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'grid', json_build_object(
'title', NULL,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'alt', CONCAT('Poster for ', m.title, ' (', m.year, ')'),
'subtext', CASE WHEN m.star_rating IS NOT NULL THEN m.star_rating::text ELSE m.year::text END,
'url', m.slug
),
'type', 'movies'
)
ORDER BY m.year ASC
)
FROM movies_artists ma
LEFT JOIN movies m ON ma.movies_id = m.id
LEFT JOIN directus_files df_movie ON m.art = df_movie.id
WHERE ma.artists_id = ar.id
AND m.last_watched IS NOT NULL
) AS movies,
(
SELECT json_agg(
json_build_object('title', s.title, 'year', s.year, 'url', s.slug)
ORDER BY s.year DESC
json_build_object(
'title', s.title,
'year', s.year,
'url', s.slug,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'grid', json_build_object(
'title', NULL,
'image', CONCAT(globals.cdn_url, '/', df_show.filename_disk),
'alt', CONCAT('Artwork for ', s.title),
'subtext', CASE
WHEN (
SELECT MAX(e1.last_watched_at)
FROM episodes e1
WHERE e1.show = s.id
) >= NOW() - INTERVAL '90 days' THEN
(
SELECT CONCAT('S', e2.season_number, 'E', e2.episode_number)
FROM episodes e2
WHERE e2.show = s.id
ORDER BY e2.last_watched_at DESC, e2.season_number DESC, e2.episode_number DESC
LIMIT 1
)
ELSE s.year::text
END,
'url', s.slug
),
'type', 'tv'
)
ORDER BY s.year ASC
)
FROM shows_artists sa
LEFT JOIN shows s ON sa.shows_id = s.id
LEFT JOIN directus_files df_show ON s.art = df_show.id
WHERE sa.artists_id = ar.id
AND EXISTS (
SELECT 1
FROM episodes e
WHERE e.show = s.id
AND e.last_watched_at IS NOT NULL
)
) AS shows,
(
SELECT json_agg(
json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC
)
FROM posts_artists pa
LEFT JOIN posts p ON pa.posts_id = p.id
WHERE pa.artists_id = ar.id
) AS posts,
(
SELECT json_agg(
json_build_object(
'name', related_ar.name_string,
'url', related_ar.slug,
'country', related_ar.country,
'total_plays', to_char(related_ar.total_plays, 'FM999,999,999,999')
'total_plays', to_char(related_ar.total_plays, 'FM999,999,999,999'),
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'grid', json_build_object(
'title', related_ar.name_string,
'image', CONCAT(globals.cdn_url, '/', df_related.filename_disk),
'alt', CASE WHEN related_ar.total_plays > 0 THEN CONCAT(to_char(related_ar.total_plays, 'FM999,999,999,999'), ' plays of ', related_ar.name_string) ELSE CONCAT('Artwork of ', related_ar.name_string) END,
'subtext', CASE WHEN related_ar.total_plays > 0 THEN CONCAT(to_char(related_ar.total_plays, 'FM999,999,999,999'), ' plays') ELSE NULL END,
'url', related_ar.slug
),
'type', 'music'
)
ORDER BY related_ar.name_string
ORDER BY related_ar.total_plays DESC
)
FROM related_artists ra
LEFT JOIN artists related_ar ON ra.related_artists_id = related_ar.id
LEFT JOIN directus_files df_related ON related_ar.art = df_related.id
WHERE ra.artists_id = ar.id
) AS related_artists
) AS related_artists,
json_build_object(
'open_graph_image', CASE
WHEN df.filename_disk IS NOT NULL AND df.filename_disk != '' AND df.filename_disk != '/' THEN CONCAT('/', df.filename_disk)
ELSE NULL
END
) AS metadata
FROM artists ar
LEFT JOIN directus_files df ON ar.art = df.id
LEFT JOIN genres g ON ar.genres = g.id
GROUP BY
ar.id,
df.filename_disk,
g.name,
g.slug,
g.emoji;
CROSS JOIN optimized_globals globals
GROUP BY ar.id, df.filename_disk, g.name, g.slug, g.emoji, globals.cdn_url;

View file

@ -7,44 +7,116 @@ SELECT
to_char(g.total_plays, 'FM999,999,999,999') AS total_plays,
g.wiki_link,
g.slug AS url,
(
SELECT
json_agg(json_build_object('name', a.name_string, 'url', a.slug, 'image', CONCAT('/', df_artist.filename_disk), 'total_plays', to_char(a.total_plays, 'FM999,999,999,999'))
ORDER BY a.total_plays DESC)
FROM
artists a
(
SELECT json_agg(
json_build_object(
'name', a.name_string,
'url', a.slug,
'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
'total_plays', to_char(a.total_plays, 'FM999,999,999,999'),
'grid', json_build_object(
'title', a.name_string,
'image', CONCAT(globals.cdn_url, '/', df_artist.filename_disk),
'alt', CASE
WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays of ', a.name_string)
ELSE CONCAT('Artwork of ', a.name_string)
END,
'subtext', CASE
WHEN a.total_plays > 0 THEN CONCAT(to_char(a.total_plays, 'FM999,999,999,999'), ' plays')
ELSE NULL
END,
'url', a.slug
),
'type', 'music'
)
ORDER BY a.total_plays DESC
)
FROM artists a
LEFT JOIN directus_files df_artist ON a.art = df_artist.id
WHERE
a.genres = g.id) AS artists,
(
SELECT
json_agg(json_build_object('title', b.title, 'author', b.author, 'url', b.slug)
ORDER BY b.title ASC)
FROM
books b
JOIN genres_books gb ON gb.books_id = b.id
WHERE
gb.genres_id = g.id) AS books,
(
SELECT
json_agg(json_build_object('title', m.title, 'year', m.year, 'url', m.slug)
ORDER BY m.year DESC)
FROM
movies m
JOIN genres_movies gm ON gm.movies_id = m.id
WHERE
gm.genres_id = g.id) AS movies,
(
SELECT
json_agg(json_build_object('title', p.title, 'date', p.date, 'url', p.slug)
ORDER BY p.date DESC)
FROM
posts_genres pg
LEFT JOIN posts p ON pg.posts_id = p.id
WHERE
pg.genres_id = g.id) AS posts
FROM
genres g
ORDER BY
g.id ASC;
WHERE a.genres = g.id
) AS artists,
(
SELECT json_agg(
json_build_object(
'title', b.title,
'author', b.author,
'url', b.slug,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'grid', json_build_object(
'title', NULL,
'image', CONCAT(globals.cdn_url, '/', df_book.filename_disk),
'alt', CONCAT('Cover for ', b.title, ' by ', b.author),
'subtext', CASE WHEN b.star_rating IS NOT NULL THEN b.star_rating ELSE NULL END,
'url', b.slug
),
'type', 'books'
)
ORDER BY b.title ASC
)
FROM books b
JOIN genres_books gb ON gb.books_id = b.id
LEFT JOIN directus_files df_book ON b.art = df_book.id
WHERE gb.genres_id = g.id
AND LOWER(b.read_status) = 'finished'
) AS books,
(
SELECT json_agg(
json_build_object(
'title', m.title,
'year', m.year,
'url', m.slug,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'grid', json_build_object(
'title', NULL,
'image', CONCAT(globals.cdn_url, '/', df_movie.filename_disk),
'alt', CONCAT('Poster for ', m.title, ' (', m.year, ')'),
'subtext', CASE WHEN m.star_rating IS NOT NULL THEN m.star_rating::text ELSE m.year::text END,
'url', m.slug
),
'type', 'movies'
)
ORDER BY m.year ASC
)
FROM movies m
JOIN genres_movies gm ON gm.movies_id = m.id
LEFT JOIN directus_files df_movie ON m.art = df_movie.id
WHERE gm.genres_id = g.id
AND m.last_watched IS NOT NULL
) AS movies,
(
SELECT json_agg(
json_build_object(
'title', p.title,
'date', p.date,
'url', p.slug,
'grid', json_build_object(
'title', p.title,
'image', CONCAT(globals.cdn_url, '/', df_post.filename_disk),
'alt', p.title,
'subtext', TO_CHAR(p.date, 'FMMonth DD, YYYY'),
'url', p.slug
),
'type', 'posts'
)
ORDER BY p.date DESC
)
FROM posts_genres pg
LEFT JOIN posts p ON pg.posts_id = p.id
LEFT JOIN directus_files df_post ON p.image = df_post.id
WHERE pg.genres_id = g.id
) AS posts,
json_build_object(
'open_graph_image', (
SELECT CONCAT('/', df_artist.filename_disk)
FROM artists a
LEFT JOIN directus_files df_artist ON a.art = df_artist.id
WHERE a.genres = g.id
AND df_artist.filename_disk IS NOT NULL
AND df_artist.filename_disk != ''
ORDER BY a.total_plays DESC
LIMIT 1
)
) AS metadata
FROM genres g
CROSS JOIN optimized_globals globals
ORDER BY g.id ASC;

View file

@ -1,17 +1,20 @@
CREATE OR REPLACE VIEW optimized_listens AS SELECT DISTINCT ON (l.id, l.listened_at, l.track_name, l.artist_name, l.album_name)
CREATE OR REPLACE VIEW optimized_listens AS
SELECT DISTINCT ON (l.id, l.listened_at, l.track_name, l.artist_name, l.album_name)
l.id,
l.listened_at,
l.track_name,
l.artist_name,
l.album_name,
l.album_key,
CONCAT('/', df_art.filename_disk) AS artist_art,
CONCAT(globals.cdn_url, '/', df_art.filename_disk) AS artist_art,
CONCAT('/', df_art.filename_disk) AS opengraph_image_artist,
a.genres AS artist_genres,
g.name AS genre_name,
g.slug AS genre_url,
a.country AS artist_country,
a.slug AS artist_url,
CONCAT('/', df_album.filename_disk) AS album_art
CONCAT(globals.cdn_url, '/', df_album.filename_disk) AS album_art,
CONCAT('/', df_album.filename_disk) AS opengraph_image_album
FROM
listens l
LEFT JOIN artists a ON (l.artist_name = a.name_string)
@ -19,10 +22,11 @@ FROM
LEFT JOIN directus_files df_art ON (a.art = df_art.id)
LEFT JOIN directus_files df_album ON (al.art = df_album.id)
LEFT JOIN genres g ON (a.genres = g.id)
CROSS JOIN optimized_globals globals
ORDER BY
l.id,
l.listened_at,
l.track_name,
l.artist_name,
l.album_name;
l.album_name,
globals.cdn_url;

View file

@ -5,7 +5,20 @@ SELECT
COUNT(*) AS plays,
ol.album_art,
ol.artist_url,
json_build_object('title', ol.album_name, 'image', ol.album_art, 'url', ol.artist_url, 'alt', CONCAT(ol.album_name, ' by ', ol.artist_name), 'subtext', ol.artist_name) AS grid
json_build_object(
'title', ol.album_name,
'image', ol.album_art,
'url', ol.artist_url,
'alt', CONCAT(ol.album_name, ' by ', ol.artist_name),
'subtext', ol.artist_name
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_album IS NOT NULL AND ol.opengraph_image_album != '' AND ol.opengraph_image_album != '/' THEN ol.opengraph_image_album
ELSE NULL
END
) AS metadata
FROM
optimized_listens ol
WHERE
@ -14,7 +27,7 @@ GROUP BY
ol.album_name,
ol.artist_name,
ol.album_art,
ol.artist_url
ol.artist_url,
ol.opengraph_image_album
ORDER BY
plays DESC;

View file

@ -5,7 +5,20 @@ SELECT
ol.artist_art,
ol.artist_url,
ARRAY_AGG(DISTINCT ol.genre_name) AS genres,
json_build_object('title', ol.artist_name, 'image', ol.artist_art, 'url', ol.artist_url, 'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name), 'subtext', CONCAT(COUNT(*), ' plays')) AS grid
json_build_object(
'title', ol.artist_name,
'image', ol.artist_art,
'url', ol.artist_url,
'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name),
'subtext', CONCAT(COUNT(*), ' plays')
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_artist IS NOT NULL AND ol.opengraph_image_artist != '' AND ol.opengraph_image_artist != '/' THEN ol.opengraph_image_artist
ELSE NULL
END
) AS metadata
FROM
optimized_listens ol
WHERE
@ -13,7 +26,7 @@ WHERE
GROUP BY
ol.artist_name,
ol.artist_art,
ol.artist_url
ol.artist_url,
ol.opengraph_image_artist
ORDER BY
plays DESC;

View file

@ -5,7 +5,20 @@ SELECT
COUNT(*) AS plays,
ol.album_art,
ol.artist_url,
json_build_object('title', ol.album_name, 'image', ol.album_art, 'url', ol.artist_url, 'alt', CONCAT(ol.album_name, ' by ', ol.artist_name), 'subtext', ol.artist_name) AS grid
json_build_object(
'title', ol.album_name,
'image', ol.album_art,
'url', ol.artist_url,
'alt', CONCAT(ol.album_name, ' by ', ol.artist_name),
'subtext', ol.artist_name
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_album IS NOT NULL AND ol.opengraph_image_album != '' AND ol.opengraph_image_album != '/' THEN ol.opengraph_image_album
ELSE NULL
END
) AS metadata
FROM
optimized_listens ol
WHERE
@ -14,7 +27,7 @@ GROUP BY
ol.album_name,
ol.artist_name,
ol.album_art,
ol.artist_url
ol.artist_url,
ol.opengraph_image_album
ORDER BY
plays DESC;

View file

@ -5,7 +5,20 @@ SELECT
ol.artist_art,
ol.artist_url,
ARRAY_AGG(DISTINCT ol.genre_name) AS genres,
json_build_object('title', ol.artist_name, 'image', ol.artist_art, 'url', ol.artist_url, 'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name), 'subtext', CONCAT(COUNT(*), ' plays')) AS grid
json_build_object(
'title', ol.artist_name,
'image', ol.artist_art,
'url', ol.artist_url,
'alt', CONCAT(COUNT(*), ' plays of ', ol.artist_name),
'subtext', CONCAT(COUNT(*), ' plays')
) AS grid,
json_build_object(
'open_graph_image',
CASE
WHEN ol.opengraph_image_artist IS NOT NULL AND ol.opengraph_image_artist != '' AND ol.opengraph_image_artist != '/' THEN ol.opengraph_image_artist
ELSE NULL
END
) AS metadata
FROM
optimized_listens ol
WHERE
@ -13,6 +26,7 @@ WHERE
GROUP BY
ol.artist_name,
ol.artist_art,
ol.artist_url
ol.artist_url,
ol.opengraph_image_artist
ORDER BY
plays DESC;