From 057d75f863a165199980399849c51c2e12eedb8e Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 12 Oct 2024 16:01:02 -0700 Subject: [PATCH] feat: view queries in; media updated --- config/filters/media.js | 65 ++------ package-lock.json | 4 +- package.json | 2 +- src/assets/styles/pages/watching.css | 110 ++++++------- src/data/music.js | 148 ++++++------------ src/data/tv.js | 1 + src/includes/partials/media/grid.liquid | 55 ++++--- .../partials/media/music/chart.liquid | 16 +- .../partials/media/music/recent.liquid | 17 +- .../partials/media/watching/grid.liquid | 32 ++-- src/pages/dynamic/books/year.html | 2 +- src/pages/dynamic/music/albums/3-months.html | 4 +- .../dynamic/music/albums/this-month.html | 4 +- src/pages/dynamic/music/albums/this-week.html | 4 +- src/pages/dynamic/music/artists/3-months.html | 4 +- .../dynamic/music/artists/this-month.html | 4 +- .../dynamic/music/artists/this-week.html | 4 +- src/pages/dynamic/music/index.html | 8 +- src/pages/dynamic/music/periods/3-months.html | 6 +- .../dynamic/music/periods/this-month.html | 6 +- src/pages/dynamic/music/tracks/3-months.html | 2 +- .../dynamic/music/tracks/this-month.html | 2 +- src/pages/dynamic/music/tracks/this-week.html | 2 +- .../dynamic/watching/favorites/movies.html | 2 +- .../dynamic/watching/favorites/shows.html | 2 +- src/pages/dynamic/watching/index.html | 14 +- src/pages/dynamic/watching/recent/movies.html | 2 +- src/pages/dynamic/watching/recent/shows.html | 2 +- views/content/posts.psql | 6 +- views/feeds/search.psql | 2 +- views/media/books.psql | 14 ++ views/media/movies.psql | 16 +- views/media/music/album-releases.psql | 10 +- views/media/music/month-tracks.psql | 21 --- views/media/music/month/albums.psql | 22 +++ views/media/music/month/artists.psql | 22 +++ views/media/music/month/genres.psql | 17 ++ views/media/music/month/tracks.psql | 37 +++++ views/media/music/recent-tracks.psql | 10 +- views/media/music/three-month-tracks.psql | 21 --- views/media/music/three-month/albums.psql | 22 +++ views/media/music/three-month/artists.psql | 22 +++ views/media/music/three-month/genres.psql | 17 ++ views/media/music/three-month/tracks.psql | 37 +++++ views/media/music/week/albums.psql | 22 +++ views/media/music/week/artists.psql | 22 +++ views/media/music/week/genres.psql | 17 ++ views/media/music/week/tracks.psql | 37 +++++ views/media/shows.psql | 13 ++ 49 files changed, 578 insertions(+), 353 deletions(-) delete mode 100644 views/media/music/month-tracks.psql create mode 100644 views/media/music/month/albums.psql create mode 100644 views/media/music/month/artists.psql create mode 100644 views/media/music/month/genres.psql create mode 100644 views/media/music/month/tracks.psql delete mode 100644 views/media/music/three-month-tracks.psql create mode 100644 views/media/music/three-month/albums.psql create mode 100644 views/media/music/three-month/artists.psql create mode 100644 views/media/music/three-month/genres.psql create mode 100644 views/media/music/three-month/tracks.psql create mode 100644 views/media/music/week/albums.psql create mode 100644 views/media/music/week/artists.psql create mode 100644 views/media/music/week/genres.psql create mode 100644 views/media/music/week/tracks.psql diff --git a/config/filters/media.js b/config/filters/media.js index ff222f9b..87cc61a5 100644 --- a/config/filters/media.js +++ b/config/filters/media.js @@ -1,57 +1,4 @@ -import { DateTime } from 'luxon' -import { shuffleArray } from '../utilities/index.js' - export default { - featuredWatching: (watching, count) => { - const data = [...watching] - return shuffleArray(data).slice(0, count) - }, - normalizeMedia: (media, limit) => { - const mediaData = limit ? media.slice(0, limit) : media - return mediaData.map((item) => { - let normalized = { - title: item['title'], - image: item['image'], - url: item['url'], - type: item['type'] - } - - switch (item['type']) { - case 'artist': - normalized.alt = `${item['plays']} plays of ${item['title']}` - normalized.subtext = `${item['plays']} plays` - break - case 'album': - normalized.alt = `${item['title']} by ${item['artist']}` - normalized.subtext = `${item['artist']}` - break - case 'album-release': - normalized.alt = `${item['title']} by ${item['artist']['name']}` - normalized.subtext = `${item['artist']['name']} / ${item['release_date_formatted']}` - break - case 'movie': - normalized.alt = item['title'] - normalized.rating = item['rating'] - normalized.favorite = item['favorite'] - normalized.subtext = item.rating ? `${item['rating']} (${item['year']})` : `(${item['year']})` - break - case 'book': - normalized.title = `${item['title']} by ${item['author']}` - if (item['rating']) { - normalized.rating = item['rating'] - normalized.subtext = item['rating'] - } - break - case 'tv': - normalized.alt = item['formatted_episode'] - normalized.subtext = item['formatted_episode'] - break - } - - return normalized - }) - }, - calculatePlayPercentage: (plays, mostPlayed) => `${plays/mostPlayed * 100}%`, bookStatus: (books, status) => books.filter(book => book['status'] === status), bookFavorites: (books) => books.filter(book => book.favorite === true), bookYearLinks: (years) => years.sort((a, b) => b.value - a.value).map((year, index) => { @@ -71,7 +18,9 @@ export default { if (dataSlice.length === 0) return null if (dataSlice.length === 1) { const item = dataSlice[0] - if (type === 'genre' || type === 'artist') { + if (type === 'genre') { + return `${item['genre_name']}` + } else if (type === 'artist') { return `${item['name']}` } else if (type === 'book') { return `${item['title']}` @@ -79,7 +28,9 @@ export default { } const allButLast = dataSlice.slice(0, -1).map(item => { - if (type === 'genre' || type === 'artist') { + if (type === 'genre') { + return `${item['genre_name']}` + } else if (type === 'artist') { return `${item['name']}` } else if (type === 'book') { return `${item['title']}` @@ -89,7 +40,9 @@ export default { let last const lastItem = dataSlice[dataSlice.length - 1] - if (type === 'genre' || type === 'artist') { + if (type === 'genre') { + last = `${lastItem['genre_name']}` + } else if (type === 'artist') { last = `${lastItem['name']}` } else if (type === 'book') { last = `${lastItem['title']}` diff --git a/package-lock.json b/package-lock.json index 4c4c2381..aa0b65b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "1.0.3", + "version": "1.0.4", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.5.0", diff --git a/package.json b/package.json index f0bfd908..ac680863 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "1.0.3", + "version": "1.0.4", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "scripts": { diff --git a/src/assets/styles/pages/watching.css b/src/assets/styles/pages/watching.css index 90644e8a..9f4c8091 100644 --- a/src/assets/styles/pages/watching.css +++ b/src/assets/styles/pages/watching.css @@ -3,69 +3,71 @@ a:active > .watching.hero::after { border-color: var(--accent-color-hover); } -.icon-link + .watching.grid { +.watching.hero { + position: relative; + display: flex; + aspect-ratio: var(--aspect-ratio-banner); + + & img { + aspect-ratio: var(--aspect-ratio-banner); + border-radius: var(--border-radius-slight); + height: auto; + width: 100%; + } + + & .meta-text { + color: white; + position: absolute; + left: var(--spacing-sm); + bottom: var(--spacing-sm); + z-index: 2; + display: flex; + flex-direction: column; + + & .header { + font-weight: var(--font-weight-bold); + } + + & .subheader { + font-size: var(--font-size-sm); + display: inline-flex; + gap: var(--spacing-xs); + } + + & .header, + & .subheader { + line-height: var(--line-height-md); + text-shadow: var(--text-shadow-default); + } + } + + &::after { + position: absolute; + z-index: 1; + content: ''; + top: 0; + left: 0; + box-shadow: var(--box-shadow-media); + width: 100%; + height: 100%; + border: var(--border-default); + border-radius: var(--border-radius-slight); + transition: border-color var(--transition-duration-default) var(--transition-ease-in-out); + } +} + +.icon-link + .poster.grid { margin-top: var(--spacing-base); } -.watching { +.poster { & img { border-radius: var(--border-radius-slight); width: 100%; height: auto; } - &.hero { - position: relative; - display: flex; - aspect-ratio: var(--aspect-ratio-banner); - - & img { - aspect-ratio: var(--aspect-ratio-banner); - border-radius: var(--border-radius-slight); - } - - & .meta-text { - color: white; - position: absolute; - left: var(--spacing-sm); - bottom: var(--spacing-sm); - z-index: 2; - display: flex; - flex-direction: column; - - & .header { - font-weight: var(--font-weight-bold); - } - - & .subheader { - font-size: var(--font-size-sm); - display: inline-flex; - gap: var(--spacing-xs); - } - - & .header, - & .subheader { - line-height: var(--line-height-md); - text-shadow: var(--text-shadow-default); - } - } - - &::after { - position: absolute; - z-index: 1; - content: ''; - top: 0; - left: 0; - box-shadow: var(--box-shadow-media); - width: 100%; - height: 100%; - border: var(--border-default); - border-radius: var(--border-radius-slight); - transition: border-color var(--transition-duration-default) var(--transition-ease-in-out); - } - } - - &.grid { + &.media-grid { display: grid; gap: var(--spacing-sm); grid-template-columns: repeat(2, minmax(0, 1fr)); diff --git a/src/data/music.js b/src/data/music.js index b4902222..ae9c94ed 100644 --- a/src/data/music.js +++ b/src/data/music.js @@ -13,7 +13,6 @@ const fetchDataFromView = async (viewName) => { const { data, error } = await supabase .from(viewName) .select('*') - .order('listened_at', { ascending: false }) .range(rangeStart, rangeStart + PAGE_SIZE - 1) if (error) { @@ -23,7 +22,7 @@ const fetchDataFromView = async (viewName) => { if (data.length === 0) break - rows = rows.concat(data) + rows = [...rows, ...data] if (data.length < PAGE_SIZE) break rangeStart += PAGE_SIZE @@ -32,113 +31,70 @@ const fetchDataFromView = async (viewName) => { return rows } -const aggregateData = (data, groupByField, groupByType) => { - const aggregation = {} - - data.forEach(item => { - const key = item[groupByField] - if (!aggregation[key]) { - let imageField = '' - - switch (groupByType) { - case 'artist': - imageField = item['artist_art'] - break - case 'album': - imageField = item['album_art'] - break - case 'track': - imageField = item['album_art'] - break - default: - imageField = '' - } - - aggregation[key] = { - title: item[groupByField], - plays: 0, - url: item['artist_url'], - image: imageField, - genre: item['artist_genres'], - type: groupByType - } - - if (groupByType === 'track' || groupByType === 'album') aggregation[key]['artist'] = item['artist_name'] - } - - aggregation[key].plays++ - }) - - return Object.values(aggregation).sort((a, b) => b['plays'] - a['plays']).map((item, index) => ({ ...item, rank: index + 1 })) -} - -const buildRecents = (data) => { - return data.map(listen => ({ - title: listen['track_name'], - artist: listen['artist_name'], - url: listen['artist_url'], - timestamp: listen['listened_at'], - image: listen['album_art'], - type: 'track' - })).sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp)) -} - -const aggregateGenres = (data) => { - const genreAggregation = {} - - data.forEach(item => { - const genre = item['genre_name'] || '' - const genreUrl = item['genre_url'] || '' - - if (!genreAggregation[genre]) { - genreAggregation[genre] = { - name: genre, - url: genreUrl, - plays: 0, - type: 'genre' - } - } - - genreAggregation[genre]['plays']++ - }) - - return Object.values(genreAggregation).sort((a, b) => b['plays'] - a['plays']) -} - -export default async function () { +export default async function fetchMusicData() { try { - const [recentTracks, monthTracks, threeMonthTracks] = await Promise.all([ + const [ + recentTracks, + weekTracks, + weekArtists, + weekAlbums, + weekGenres, + monthTracks, + monthArtists, + monthAlbums, + monthGenres, + threeMonthTracks, + threeMonthArtists, + threeMonthAlbums, + threeMonthGenres, + ] = await Promise.all([ fetchDataFromView('recent_tracks'), + fetchDataFromView('week_tracks'), + fetchDataFromView('week_artists'), + fetchDataFromView('week_albums'), + fetchDataFromView('week_genres'), fetchDataFromView('month_tracks'), - fetchDataFromView('three_month_tracks') + fetchDataFromView('month_artists'), + fetchDataFromView('month_albums'), + fetchDataFromView('month_genres'), + fetchDataFromView('three_month_tracks'), + fetchDataFromView('three_month_artists'), + fetchDataFromView('three_month_albums'), + fetchDataFromView('three_month_genres'), ]) return { - recent: buildRecents(recentTracks), + recent: recentTracks, week: { - artists: aggregateData(recentTracks, 'artist_name', 'artist'), - albums: aggregateData(recentTracks, 'album_name', 'album'), - tracks: aggregateData(recentTracks, 'track_name', 'track'), - genres: aggregateGenres(recentTracks), - totalTracks: recentTracks.length.toLocaleString('en-US') + tracks: weekTracks, + artists: weekArtists, + albums: weekAlbums, + genres: weekGenres, + totalTracks: weekTracks + .reduce((acc, track) => acc + track.plays, 0) + .toLocaleString('en-US'), }, month: { - artists: aggregateData(monthTracks, 'artist_name', 'artist'), - albums: aggregateData(monthTracks, 'album_name', 'album'), - tracks: aggregateData(monthTracks, 'track_name', 'track'), - genres: aggregateGenres(monthTracks), - totalTracks: monthTracks.length.toLocaleString('en-US') + tracks: monthTracks, + artists: monthArtists, + albums: monthAlbums, + genres: monthGenres, + totalTracks: monthTracks + .reduce((acc, track) => acc + track.plays, 0) + .toLocaleString('en-US'), }, threeMonth: { - artists: aggregateData(threeMonthTracks, 'artist_name', 'artist'), - albums: aggregateData(threeMonthTracks, 'album_name', 'album'), - tracks: aggregateData(threeMonthTracks, 'track_name', 'track'), - genres: aggregateGenres(threeMonthTracks), - totalTracks: threeMonthTracks.length.toLocaleString('en-US') - } + tracks: threeMonthTracks, + artists: threeMonthArtists, + albums: threeMonthAlbums, + genres: threeMonthGenres, + totalTracks: threeMonthTracks + .reduce((acc, track) => acc + track.plays, 0) + .toLocaleString('en-US'), + }, } } catch (error) { - console.error('Error in fetching and processing music data:', error) + console.error('Error fetching and processing music data:', error) return {} } } \ No newline at end of file diff --git a/src/data/tv.js b/src/data/tv.js index 4cf0135c..06a9e4e1 100644 --- a/src/data/tv.js +++ b/src/data/tv.js @@ -40,6 +40,7 @@ export default async function () { image: show['episode']['image'], backdrop: show['episode']['backdrop'], last_watched_at: show['episode']['last_watched_at'], + grid: show['grid'], type: 'tv' })) diff --git a/src/includes/partials/media/grid.liquid b/src/includes/partials/media/grid.liquid index 8b36eeb6..4ce1e9c1 100644 --- a/src/includes/partials/media/grid.liquid +++ b/src/includes/partials/media/grid.liquid @@ -1,44 +1,51 @@ -{%- assign hidePagination = count or data.pages.size <= 1 -%} -{%- assign media = data.items | default: data | normalizeMedia: count -%} -
- {%- for item in media | default: media.size -%} - {%- capture alt -%}{{ item.title | escape }} ({{ item.year }}){% endcapture %} - {%- assign alt = item.alt | strip | escape -%} - +{%- assign pageCount = pagination.pages.size | default: 0 -%} +{%- assign hidePagination = pageCount <= 1 -%} +
+ {%- for item in data limit: count -%} + {%- assign alt = item.grid.alt | strip | escape -%} +
- {%- if item.title -%} -
{{ item.title }}
- {%- endif -%} - {%- if item.plays -%} -
{{ item.plays }} plays
- {%- elsif item.subtext -%} -
{{ item.subtext }}
- {%- endif -%} +
{{ item.grid.title }}
+
{{ item.grid.subtext }}
{%- assign loadingStrategy = loading | default: 'lazy' -%} - {%- if shape == 'square' -%} + {%- if shape == 'poster' -%} {{ alt }} + {%- elsif shape == 'square' -%} + {{ alt }} - {%- else -%} + {%- elsif shape == 'vertical' -%} {{ alt }} {%- unless hidePagination -%} - {% render "partials/nav/paginator.liquid", pagination:data %} + {% render "partials/nav/paginator.liquid", pagination:pagination %} {%- endunless -%} \ No newline at end of file diff --git a/src/includes/partials/media/music/chart.liquid b/src/includes/partials/media/music/chart.liquid index 6b62052c..8a00b224 100644 --- a/src/includes/partials/media/music/chart.liquid +++ b/src/includes/partials/media/music/chart.liquid @@ -1,22 +1,20 @@
- {%- assign items = data.items | default: data -%}
    - {%- for item in items limit: count | default: items.size -%} - {%- assign playTotal = playTotal | default: mostPlayed -%} - {%- assign percentage = item.plays | calculatePlayPercentage: playTotal -%} -
  1. + {%- for item in data limit: count -%} + {%- assign percentage = item.chart.percentage | append: '%' -%} +
  2. - {{ item.title }} + {{ item.chart.title }} {%- capture playsLabel -%} - {%- if item.plays > 1 -%} + {%- if item.chart.plays > 1 -%} plays {%- else -%} play {%- endif -%} {%- endcapture -%} - {{ item.artist }} - {{ item.plays }} {{ playsLabel }} + {{ item.chart.artist }} + {{ item.chart.plays }} {{ playsLabel }}
    {% render "partials/media/progress-bar.liquid", percentage:percentage %}
    diff --git a/src/includes/partials/media/music/recent.liquid b/src/includes/partials/media/music/recent.liquid index 41d977f6..afbbc189 100644 --- a/src/includes/partials/media/music/recent.liquid +++ b/src/includes/partials/media/music/recent.liquid @@ -1,17 +1,16 @@
    {%- for item in data limit: 10 -%} - {%- capture alt -%}{{ item.title | escape }} by {{ item.artist }}{%- endcapture -%}
    - + {{ alt }}
    - {{ item.title }} - {{ item.artist }} + {{ item.chart.title }} + {{ item.chart.subtext }}
    - {{ item.timestamp | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }} + {{ item.chart.played_at | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }}
    {%- endfor -%} diff --git a/src/includes/partials/media/watching/grid.liquid b/src/includes/partials/media/watching/grid.liquid index f58903f5..61a5fb2e 100644 --- a/src/includes/partials/media/watching/grid.liquid +++ b/src/includes/partials/media/watching/grid.liquid @@ -1,32 +1,32 @@ -{%- assign hidePagination = count or data.pages.size <= 1 -%} +{%- assign pageCount = pagination.pages.size | default: 0 -%} +{%- assign hidePagination = pageCount <= 1 -%}
    - {%- assign items = data.items | default: mediaItems -%} - {%- for item in items limit: count -%} - {%- capture alt -%}{{ item.title | escape }} ({{ item.year }}){% endcapture %} - + {%- for item in data limit: count -%} + {%- assign alt = item.grid.grid.alt | strip | escape -%} +
    - {%- if item.type == 'movie' -%} -
    {{ item.title }}
    + {%- if item.grid.type == 'movie' -%} +
    {{ item.grid.title }}
    - {%- if item.rating -%} - {{ item.rating }} + {%- if item.grid.rating -%} + {{ item.grid.rating }} {%- endif -%} - ({{ item.year }}) + ({{ item.grid.year }})
    {%- else -%} -
    {{ item.title }}
    -
    ({{ item.year }})
    +
    {{ item.grid.title }}
    +
    ({{ item.grid.year }})
    {%- endif -%}
    {%- assign loadingStrategy = loading | default: 'lazy' -%} {{ alt }} {%- unless hidePagination -%} - {% render "partials/nav/paginator.liquid", pagination:data %} + {% render "partials/nav/paginator.liquid", pagination:pagination %} {%- endunless -%} \ No newline at end of file diff --git a/src/pages/dynamic/books/year.html b/src/pages/dynamic/books/year.html index 9b316683..0012c626 100644 --- a/src/pages/dynamic/books/year.html +++ b/src/pages/dynamic/books/year.html @@ -21,4 +21,4 @@ schema: books-year

    I finished {{ bookData.size }} books in {{ year.value }}.{%- if favoriteBooks %} Among my favorites were {{ favoriteBooks }}.{%- endif -%}

    {% endif %}
    -{% render "partials/media/grid.liquid", data:bookData, shape: "vertical", count: 200, loading: "eager" %} \ No newline at end of file +{% render "partials/media/grid.liquid", data:bookData, shape:"vertical", count: 200, loading: "eager" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/albums/3-months.html b/src/pages/dynamic/music/albums/3-months.html index c2361a1f..e9588623 100644 --- a/src/pages/dynamic/music/albums/3-months.html +++ b/src/pages/dynamic/music/albums/3-months.html @@ -6,7 +6,7 @@ pagination: data: music.threeMonth.albums size: 24 permalink: "/music/albums/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.threeMonth.artists[0].image +image: music.threeMonth.artists[0].grid.image schema: music ---     {% tablericon "arrow-left" %} Back to music @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file +{% render "partials/media/grid.liquid" data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/albums/this-month.html b/src/pages/dynamic/music/albums/this-month.html index 11cf8e38..581c4801 100644 --- a/src/pages/dynamic/music/albums/this-month.html +++ b/src/pages/dynamic/music/albums/this-month.html @@ -6,7 +6,7 @@ pagination: data: music.month.albums size: 24 permalink: "/music/albums/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.month.artists[0].image +image: music.month.artists[0].grid.image schema: music --- {% tablericon "arrow-left" %} Back to music @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file +{% render "partials/media/grid.liquid" data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/albums/this-week.html b/src/pages/dynamic/music/albums/this-week.html index a599a7a5..e34b3b21 100644 --- a/src/pages/dynamic/music/albums/this-week.html +++ b/src/pages/dynamic/music/albums/this-week.html @@ -6,7 +6,7 @@ pagination: data: music.week.albums size: 24 permalink: "/music/albums/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.week.artists[0].image +image: music.week.artists[0].grid.image schema: music --- {% tablericon "arrow-left" %} Back to music @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file +{% render "partials/media/grid.liquid" data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/3-months.html b/src/pages/dynamic/music/artists/3-months.html index b55bf1be..c3c77ba6 100644 --- a/src/pages/dynamic/music/artists/3-months.html +++ b/src/pages/dynamic/music/artists/3-months.html @@ -6,7 +6,7 @@ pagination: data: music.threeMonth.artists size: 24 permalink: "/music/artists/three-months/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.threeMonth.artists[0].image +image: music.threeMonth.artists[0].grid.image schema: music --- {% tablericon "arrow-left" %} Back to music @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file +{% render "partials/media/grid.liquid" data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/this-month.html b/src/pages/dynamic/music/artists/this-month.html index 4bccdf28..6d8d4eed 100644 --- a/src/pages/dynamic/music/artists/this-month.html +++ b/src/pages/dynamic/music/artists/this-month.html @@ -6,7 +6,7 @@ pagination: data: music.month.artists size: 24 permalink: "/music/artists/this-month/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.month.artists[0].image +image: music.month.artists[0].grid.image schema: music --- {% tablericon "arrow-left" %} Back to music @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file +{% render "partials/media/grid.liquid" data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/artists/this-week.html b/src/pages/dynamic/music/artists/this-week.html index feb85085..2c4c0a2f 100644 --- a/src/pages/dynamic/music/artists/this-week.html +++ b/src/pages/dynamic/music/artists/this-week.html @@ -6,7 +6,7 @@ pagination: data: music.week.artists size: 24 permalink: "/music/artists/this-week/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}/{% endif %}index.html" -image: music.week.artists[0].image +image: music.week.artists[0].grid.image schema: music --- {% tablericon "arrow-left" %} Back to music @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/grid.liquid" data:pagination, shape: "square" %} \ No newline at end of file +{% render "partials/media/grid.liquid" data:pagination.items, pagination:pagination shape:"square" %} \ No newline at end of file diff --git a/src/pages/dynamic/music/index.html b/src/pages/dynamic/music/index.html index 226ae244..e0664149 100644 --- a/src/pages/dynamic/music/index.html +++ b/src/pages/dynamic/music/index.html @@ -18,14 +18,14 @@ schema: music-index Artists -{% render "partials/media/grid.liquid", data:music.week.artists, shape: "square", count: 8, loading: "eager" %} +{% render "partials/media/grid.liquid", data:music.week.artists, shape:"square", count: 8, loading: "eager" %}

    {% tablericon "vinyl" %} Albums

    -{% render "partials/media/grid.liquid", data:music.week.albums, shape: "square", count: 8 %} +{% render "partials/media/grid.liquid", data:music.week.albums, shape:"square", count: 8 %}

    {% tablericon "playlist" %} @@ -41,7 +41,7 @@ schema: music-index {% render "partials/media/music/recent", data:music.recent %}

    - {% render "partials/media/music/chart.liquid", data:music.week.tracks, mostPlayed:music.week.tracks[0].plays, count: 10 %} + {% render "partials/media/music/chart.liquid", data:music.week.tracks, count: 10 %}
    {% if albumReleases.size > 0 %} @@ -49,5 +49,5 @@ schema: music-index {% tablericon "calendar-time" %} Anticipated albums -{% render "partials/media/grid.liquid", data:albumReleases.upcoming, shape: "square", count: 8 %} +{% render "partials/media/grid.liquid", data:albumReleases.upcoming, shape:"square", count: 8 %} {% endif %} \ No newline at end of file diff --git a/src/pages/dynamic/music/periods/3-months.html b/src/pages/dynamic/music/periods/3-months.html index d7be1a8d..1fcb17b0 100644 --- a/src/pages/dynamic/music/periods/3-months.html +++ b/src/pages/dynamic/music/periods/3-months.html @@ -18,18 +18,18 @@ schema: music-period Artists -{% render "partials/media/grid.liquid", data:music.threeMonth.artists, shape: "square", count: 8, loading: "eager" %} +{% render "partials/media/grid.liquid", data:music.threeMonth.artists, shape:"square", count: 8, loading: "eager" %}

    {% tablericon "vinyl" %} Albums

    -{% render "partials/media/grid.liquid", data:music.threeMonth.albums, shape: "square", count: 8 %} +{% render "partials/media/grid.liquid", data:music.threeMonth.albums, shape:"square", count: 8 %}

    {% tablericon "playlist" %} Tracks

    -{% render "partials/media/music/chart.liquid", data:music.threeMonth.tracks, mostPlayed:music.threeMonth.tracks[0].plays, count: 10 %} \ No newline at end of file +{% render "partials/media/music/chart.liquid", data:music.threeMonth.tracks, count: 10 %} \ No newline at end of file diff --git a/src/pages/dynamic/music/periods/this-month.html b/src/pages/dynamic/music/periods/this-month.html index 86842e54..c88696c2 100644 --- a/src/pages/dynamic/music/periods/this-month.html +++ b/src/pages/dynamic/music/periods/this-month.html @@ -18,18 +18,18 @@ schema: music-period Artists -{% render "partials/media/grid.liquid", data:music.month.artists, shape: "square", count: 8, loading: "eager" %} +{% render "partials/media/grid.liquid", data:music.month.artists, shape:"square", count: 8, loading: "eager" %}

    {% tablericon "vinyl" %} Albums

    -{% render "partials/media/grid.liquid", data:music.month.albums, shape: "square", count: 8 %} +{% render "partials/media/grid.liquid", data:music.month.albums, shape:"square", count: 8 %}

    {% tablericon "playlist" %} Tracks

    -{% render "partials/media/music/chart.liquid", data:music.month.tracks, mostPlayed:music.month.tracks[0].plays, count: 10 %} \ No newline at end of file +{% render "partials/media/music/chart.liquid", data:music.month.tracks, count: 10 %} \ No newline at end of file diff --git a/src/pages/dynamic/music/tracks/3-months.html b/src/pages/dynamic/music/tracks/3-months.html index d03b780f..e4014173 100644 --- a/src/pages/dynamic/music/tracks/3-months.html +++ b/src/pages/dynamic/music/tracks/3-months.html @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/music/chart.liquid" data:pagination, playTotal: music.threeMonth.tracks[0].plays %} \ No newline at end of file +{% render "partials/media/music/chart.liquid" data:pagination.items %} \ No newline at end of file diff --git a/src/pages/dynamic/music/tracks/this-month.html b/src/pages/dynamic/music/tracks/this-month.html index 001fb62a..0759f528 100644 --- a/src/pages/dynamic/music/tracks/this-month.html +++ b/src/pages/dynamic/music/tracks/this-month.html @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/music/chart.liquid" data:pagination, playTotal: music.month.tracks[0].plays %} \ No newline at end of file +{% render "partials/media/music/chart.liquid" data:pagination.items %} \ No newline at end of file diff --git a/src/pages/dynamic/music/tracks/this-week.html b/src/pages/dynamic/music/tracks/this-week.html index 09ce5851..2eb5470b 100644 --- a/src/pages/dynamic/music/tracks/this-week.html +++ b/src/pages/dynamic/music/tracks/this-week.html @@ -17,4 +17,4 @@ schema: music

    You can also take a look at the concerts I've been to.

    {% endif %} -{% render "partials/media/music/chart.liquid" data:pagination, playTotal: music.week.tracks[0].plays %} \ No newline at end of file +{% render "partials/media/music/chart.liquid" data:pagination.items %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/favorites/movies.html b/src/pages/dynamic/watching/favorites/movies.html index ab1c3373..5d90324c 100644 --- a/src/pages/dynamic/watching/favorites/movies.html +++ b/src/pages/dynamic/watching/favorites/movies.html @@ -14,4 +14,4 @@ schema: favorite-movies

    These are my favorite movies. There are many like them, but these are mine.

    {% endif %} -{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/grid.liquid", data:pagination.items, pagination:pagination, shape:"poster" %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/favorites/shows.html b/src/pages/dynamic/watching/favorites/shows.html index e200acda..8987908a 100644 --- a/src/pages/dynamic/watching/favorites/shows.html +++ b/src/pages/dynamic/watching/favorites/shows.html @@ -14,4 +14,4 @@ schema: favorite-shows

    These are my favorite shows. There are many like them, but these are mine.

    {% endif %} -{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/grid.liquid", data:pagination.items, pagination:pagination, shape:"poster" %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/index.html b/src/pages/dynamic/watching/index.html index 1b37733a..c5209a8a 100644 --- a/src/pages/dynamic/watching/index.html +++ b/src/pages/dynamic/watching/index.html @@ -6,7 +6,7 @@ permalink: "/watching/index.html" updated: "now" schema: watching --- -{% assign featuredMovie = movies.recentlyWatched | featuredWatching: 1 | first %} +{% assign featuredMovie = movies.recentlyWatched | shuffleArray | first %}

    {{ title }}

    {% render "partials/media/watching/hero.liquid" movie:featuredMovie %}

    Here's all of the TV and movies I've been watching presented in what is (hopefully) an organized fashion.

    @@ -18,27 +18,27 @@ schema: watching Recent movies -{% render "partials/media/grid.liquid", data:movies.recentlyWatched, shape: "vertical", count: 6 %} +{% render "partials/media/grid.liquid", data:movies.recentlyWatched, shape:"vertical", count: 6 %}

    {% tablericon "device-tv-old" %} Recent shows

    -{% render "partials/media/grid.liquid", data:tv.recentlyWatched, shape: "vertical", count: 6 %} +{% render "partials/media/grid.liquid", data:tv.recentlyWatched, shape:"vertical", count: 6 %}

    {% tablericon "star" %} Favorite movies

    -{% assign favoriteMovies = movies.favorites | shuffleArray | featuredWatching: 6 %} -{% render "partials/media/watching/grid.liquid", mediaItems:favoriteMovies, count: 6 %} +{% assign favoriteMovies = movies.favorites | shuffleArray %} +{% render "partials/media/grid.liquid", data:favoriteMovies, shape:"vertical", count: 6 %}

    {% tablericon "star" %} Favorite shows

    -{% assign favoriteShows = tv.favorites | shuffleArray | featuredWatching: 6 %} -{% render "partials/media/watching/grid.liquid", mediaItems:favoriteShows, count: 6 %} \ No newline at end of file +{% assign favoriteShows = tv.favorites | shuffleArray %} +{% render "partials/media/grid.liquid", data:favoriteShows, shape:"vertical", count: 6 %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/recent/movies.html b/src/pages/dynamic/watching/recent/movies.html index 6c308248..7133c783 100644 --- a/src/pages/dynamic/watching/recent/movies.html +++ b/src/pages/dynamic/watching/recent/movies.html @@ -14,4 +14,4 @@ schema: watching

    These are the movies I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

    {% endif %} -{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/grid.liquid", data:pagination.items, pagination:pagination, shape:"poster" %} \ No newline at end of file diff --git a/src/pages/dynamic/watching/recent/shows.html b/src/pages/dynamic/watching/recent/shows.html index c90a439e..e1687d39 100644 --- a/src/pages/dynamic/watching/recent/shows.html +++ b/src/pages/dynamic/watching/recent/shows.html @@ -14,4 +14,4 @@ schema: watching-shows

    These are the shows I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

    {% endif %} -{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/grid.liquid", data:pagination.items, pagination:pagination, shape:"poster" %} \ No newline at end of file diff --git a/views/content/posts.psql b/views/content/posts.psql index 684738c8..e2bbe6ea 100644 --- a/views/content/posts.psql +++ b/views/content/posts.psql @@ -8,7 +8,11 @@ SELECT p.featured, p.slug AS url, p.mastodon_url, - CONCAT('/', df.filename_disk) AS 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 image, p.image_alt, ( diff --git a/views/feeds/search.psql b/views/feeds/search.psql index 05c3ef28..39cf6dc0 100644 --- a/views/feeds/search.psql +++ b/views/feeds/search.psql @@ -40,7 +40,7 @@ WITH search_data AS ( SELECT 'movie' AS content_type, CASE - WHEN m.rating IS NOT NULL THEN CONCAT('🎥 ', m.title, ' (', m.rating, ')') -- Add emoji and rating for movies + WHEN m.rating IS NOT NULL THEN CONCAT('🎥 ', m.title, ' (', m.rating, ')') ELSE CONCAT('🎥 ', m.title) END AS title, CONCAT('https://coryd.dev', m.url) AS url, diff --git a/views/media/books.psql b/views/media/books.psql index a7c6ba36..7fe0a4e7 100644 --- a/views/media/books.psql +++ b/views/media/books.psql @@ -1,6 +1,7 @@ CREATE OR REPLACE VIEW optimized_books AS SELECT b.date_finished, + EXTRACT(YEAR FROM b.date_finished) AS year, b.author, b.description, b.title, @@ -87,6 +88,19 @@ SELECT WHERE rbk.books_id = b.id ) AS related_books, + json_build_object( + 'title', CONCAT(b.title, ' by ', b.author), + 'image', CONCAT('/', df.filename_disk), + 'url', b.slug, + 'alt', CONCAT(b.title, ' by ', b.author), + 'subtext', + CASE + WHEN b.star_rating IS NOT NULL + THEN CONCAT(EXTRACT(YEAR FROM b.date_finished), ' (', b.star_rating, ')') + ELSE EXTRACT(YEAR FROM b.date_finished)::TEXT + END + ) AS grid, + CASE WHEN LOWER(b.read_status) = 'finished' AND b.star_rating IS NOT NULL THEN json_build_object( 'title', b.title, diff --git a/views/media/movies.psql b/views/media/movies.psql index c15b57dc..608e8dd4 100644 --- a/views/media/movies.psql +++ b/views/media/movies.psql @@ -12,12 +12,22 @@ SELECT m.description, m.review, 'movie' AS type, - m.slug AS url, - CONCAT('/', df.filename_disk) AS image, CONCAT('/', df2.filename_disk) AS backdrop, + json_build_object( + 'title', m.title, + 'url', m.slug, + 'image', CONCAT('/', df.filename_disk), + 'backdrop', CONCAT('/', df2.filename_disk), + 'alt', CONCAT(m.title, ' (', m.year, ')'), + 'subtext', CASE + WHEN m.star_rating IS NOT NULL THEN CONCAT(m.year, ' (', m.star_rating, ')') + ELSE m.year::TEXT + END + ) AS grid, + ( SELECT array_agg(t.name) FROM movies_tags mt @@ -95,7 +105,7 @@ SELECT WHEN m.star_rating IS NOT NULL AND m.last_watched IS NOT NULL THEN json_build_object( 'title', m.title, - 'url', CONCAT('https://coryd.dev', m.slug), + 'url', CONCAT('https://coryd.dev/movies/', m.slug), 'date', m.last_watched, 'description', m.description, 'image', CONCAT('/', df.filename_disk), diff --git a/views/media/music/album-releases.psql b/views/media/music/album-releases.psql index 7c015fa5..b3912b85 100644 --- a/views/media/music/album-releases.psql +++ b/views/media/music/album-releases.psql @@ -13,7 +13,15 @@ SELECT 'description', ar.description ) AS artist, - EXTRACT(EPOCH FROM a.release_date) AS release_timestamp + EXTRACT(EPOCH FROM a.release_date) AS release_timestamp, + + json_build_object( + 'title', a.name, + 'image', CONCAT('/', df.filename_disk), + 'url', a.release_link, + 'alt', CONCAT(a.name, ' by ', ar.name_string), + 'subtext', CONCAT(ar.name_string, ' / ', a.release_date) + ) AS grid FROM albums a diff --git a/views/media/music/month-tracks.psql b/views/media/music/month-tracks.psql deleted file mode 100644 index 1533886e..00000000 --- a/views/media/music/month-tracks.psql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE OR REPLACE VIEW month_tracks AS -SELECT - ol.id, - ol.listened_at, - ol.track_name, - ol.artist_name, - ol.album_name, - ol.album_key, - ol.artist_art, - ol.artist_genres, - ol.genre_name, - ol.artist_country, - ol.album_art, - ol.artist_url, - ol.genre_url -FROM - optimized_listens ol -WHERE - TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '30 days' -ORDER BY - TO_TIMESTAMP(ol.listened_at) DESC; \ No newline at end of file diff --git a/views/media/music/month/albums.psql b/views/media/music/month/albums.psql new file mode 100644 index 00000000..4106ea89 --- /dev/null +++ b/views/media/music/month/albums.psql @@ -0,0 +1,22 @@ +CREATE OR REPLACE VIEW month_albums AS +SELECT + ol.album_name, + ol.artist_name, + 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 +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '30 days' +GROUP BY + ol.album_name, ol.artist_name, ol.album_art, ol.artist_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/month/artists.psql b/views/media/music/month/artists.psql new file mode 100644 index 00000000..95804957 --- /dev/null +++ b/views/media/music/month/artists.psql @@ -0,0 +1,22 @@ +CREATE OR REPLACE VIEW month_artists AS +SELECT + ol.artist_name, + COUNT(*) AS plays, + 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 +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '30 days' +GROUP BY + ol.artist_name, ol.artist_art, ol.artist_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/month/genres.psql b/views/media/music/month/genres.psql new file mode 100644 index 00000000..7cee2489 --- /dev/null +++ b/views/media/music/month/genres.psql @@ -0,0 +1,17 @@ +CREATE OR REPLACE VIEW month_genres AS +SELECT + ol.genre_name, + ol.genre_url, + COUNT(*) AS plays, + json_build_object( + 'alt', ol.genre_name, + 'subtext', CONCAT(COUNT(*), ' plays') + ) AS grid +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '30 days' +GROUP BY + ol.genre_name, ol.genre_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/month/tracks.psql b/views/media/music/month/tracks.psql new file mode 100644 index 00000000..caed29aa --- /dev/null +++ b/views/media/music/month/tracks.psql @@ -0,0 +1,37 @@ +CREATE OR REPLACE VIEW month_tracks AS +WITH track_stats AS ( + SELECT + ol.track_name, + ol.artist_name, + ol.album_name, + COUNT(*) AS plays, + MAX(ol.listened_at) AS last_listened, + ol.album_art, + ol.artist_url, + MAX(COUNT(*)) OVER () AS most_played + FROM + optimized_listens ol + WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '30 days' + GROUP BY + ol.track_name, ol.artist_name, ol.album_name, ol.album_art, ol.artist_url +) +SELECT + track_name, + artist_name, + album_name, + plays, + last_listened, + album_art, + artist_url, + json_build_object( + 'title', track_name, + 'artist', artist_name, + 'url', artist_url, + 'plays', plays, + 'alt', CONCAT(track_name, ' by ', artist_name), + 'subtext', CONCAT(album_name, ' (', plays, ' plays)'), + 'percentage', ROUND((plays::decimal / most_played) * 100, 2) + ) AS chart +FROM track_stats +ORDER BY plays DESC, last_listened DESC; \ No newline at end of file diff --git a/views/media/music/recent-tracks.psql b/views/media/music/recent-tracks.psql index 2715cf29..b0f5db74 100644 --- a/views/media/music/recent-tracks.psql +++ b/views/media/music/recent-tracks.psql @@ -12,7 +12,15 @@ SELECT ol.artist_country, ol.album_art, ol.artist_url, - ol.genre_url + ol.genre_url, + json_build_object( + 'title', ol.track_name, + 'subtext', ol.artist_name, + 'alt', CONCAT(ol.track_name, ' by ', ol.artist_name), + 'url', ol.artist_url, + 'image', ol.album_art, + 'played_at', ol.listened_at + ) AS chart FROM optimized_listens ol WHERE diff --git a/views/media/music/three-month-tracks.psql b/views/media/music/three-month-tracks.psql deleted file mode 100644 index f94b9142..00000000 --- a/views/media/music/three-month-tracks.psql +++ /dev/null @@ -1,21 +0,0 @@ -CREATE OR REPLACE VIEW three_month_tracks AS -SELECT - ol.id, - ol.listened_at, - ol.track_name, - ol.artist_name, - ol.album_name, - ol.album_key, - ol.artist_art, - ol.artist_genres, - ol.genre_name, - ol.artist_country, - ol.album_art, - ol.artist_url, - ol.genre_url -FROM - optimized_listens ol -WHERE - TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '3 months' -ORDER BY - TO_TIMESTAMP(ol.listened_at) DESC; \ No newline at end of file diff --git a/views/media/music/three-month/albums.psql b/views/media/music/three-month/albums.psql new file mode 100644 index 00000000..fe813889 --- /dev/null +++ b/views/media/music/three-month/albums.psql @@ -0,0 +1,22 @@ +CREATE OR REPLACE VIEW three_month_albums AS +SELECT + ol.album_name, + ol.artist_name, + 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 +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '3 months' +GROUP BY + ol.album_name, ol.artist_name, ol.album_art, ol.artist_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/three-month/artists.psql b/views/media/music/three-month/artists.psql new file mode 100644 index 00000000..485fd4c5 --- /dev/null +++ b/views/media/music/three-month/artists.psql @@ -0,0 +1,22 @@ +CREATE OR REPLACE VIEW three_month_artists AS +SELECT + ol.artist_name, + COUNT(*) AS plays, + 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 +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '3 months' +GROUP BY + ol.artist_name, ol.artist_art, ol.artist_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/three-month/genres.psql b/views/media/music/three-month/genres.psql new file mode 100644 index 00000000..25d7f894 --- /dev/null +++ b/views/media/music/three-month/genres.psql @@ -0,0 +1,17 @@ +CREATE OR REPLACE VIEW three_month_genres AS +SELECT + ol.genre_name, + ol.genre_url, + COUNT(*) AS plays, + json_build_object( + 'alt', ol.genre_name, + 'subtext', CONCAT(COUNT(*), ' plays') + ) AS grid +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '3 months' +GROUP BY + ol.genre_name, ol.genre_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/three-month/tracks.psql b/views/media/music/three-month/tracks.psql new file mode 100644 index 00000000..0edc8a87 --- /dev/null +++ b/views/media/music/three-month/tracks.psql @@ -0,0 +1,37 @@ +CREATE OR REPLACE VIEW three_month_tracks AS +WITH track_stats AS ( + SELECT + ol.track_name, + ol.artist_name, + ol.album_name, + COUNT(*) AS plays, + MAX(ol.listened_at) AS last_listened, + ol.album_art, + ol.artist_url, + MAX(COUNT(*)) OVER () AS most_played + FROM + optimized_listens ol + WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '3 months' + GROUP BY + ol.track_name, ol.artist_name, ol.album_name, ol.album_art, ol.artist_url +) +SELECT + track_name, + artist_name, + album_name, + plays, + last_listened, + album_art, + artist_url, + json_build_object( + 'title', track_name, + 'artist', artist_name, + 'url', artist_url, + 'plays', plays, + 'alt', CONCAT(track_name, ' by ', artist_name), + 'subtext', CONCAT(album_name, ' (', plays, ' plays)'), + 'percentage', ROUND((plays::decimal / most_played) * 100, 2) + ) AS chart +FROM track_stats +ORDER BY plays DESC, last_listened DESC; \ No newline at end of file diff --git a/views/media/music/week/albums.psql b/views/media/music/week/albums.psql new file mode 100644 index 00000000..ba1c50e5 --- /dev/null +++ b/views/media/music/week/albums.psql @@ -0,0 +1,22 @@ +CREATE OR REPLACE VIEW week_albums AS +SELECT + ol.album_name, + ol.artist_name, + 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 +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '7 days' +GROUP BY + ol.album_name, ol.artist_name, ol.album_art, ol.artist_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/week/artists.psql b/views/media/music/week/artists.psql new file mode 100644 index 00000000..add8a30e --- /dev/null +++ b/views/media/music/week/artists.psql @@ -0,0 +1,22 @@ +CREATE OR REPLACE VIEW week_artists AS +SELECT + ol.artist_name, + COUNT(*) AS plays, + 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 +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '7 days' +GROUP BY + ol.artist_name, ol.artist_art, ol.artist_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/week/genres.psql b/views/media/music/week/genres.psql new file mode 100644 index 00000000..fffe157e --- /dev/null +++ b/views/media/music/week/genres.psql @@ -0,0 +1,17 @@ +CREATE OR REPLACE VIEW week_genres AS +SELECT + ol.genre_name, + ol.genre_url, + COUNT(*) AS plays, + json_build_object( + 'alt', ol.genre_name, + 'subtext', CONCAT(COUNT(*), ' plays') + ) AS grid +FROM + optimized_listens ol +WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '7 days' +GROUP BY + ol.genre_name, ol.genre_url +ORDER BY + plays DESC; \ No newline at end of file diff --git a/views/media/music/week/tracks.psql b/views/media/music/week/tracks.psql new file mode 100644 index 00000000..f108af6f --- /dev/null +++ b/views/media/music/week/tracks.psql @@ -0,0 +1,37 @@ +CREATE OR REPLACE VIEW week_tracks AS +WITH track_stats AS ( + SELECT + ol.track_name, + ol.artist_name, + ol.album_name, + COUNT(*) AS plays, + MAX(ol.listened_at) AS last_listened, + ol.album_art, + ol.artist_url, + MAX(COUNT(*)) OVER () AS most_played + FROM + optimized_listens ol + WHERE + TO_TIMESTAMP(ol.listened_at) >= NOW() - INTERVAL '7 days' + GROUP BY + ol.track_name, ol.artist_name, ol.album_name, ol.album_art, ol.artist_url +) +SELECT + track_name, + artist_name, + album_name, + plays, + last_listened, + album_art, + artist_url, + json_build_object( + 'title', track_name, + 'artist', artist_name, + 'url', artist_url, + 'plays', plays, + 'alt', CONCAT(track_name, ' by ', artist_name), + 'subtext', CONCAT(album_name, ' (', plays, ' plays)'), + 'percentage', ROUND((plays::decimal / most_played) * 100, 2) + ) AS chart +FROM track_stats +ORDER BY plays DESC, last_listened DESC; \ No newline at end of file diff --git a/views/media/shows.psql b/views/media/shows.psql index 819f1f9b..4c2331bc 100644 --- a/views/media/shows.psql +++ b/views/media/shows.psql @@ -12,6 +12,19 @@ SELECT CONCAT('/', df_art.filename_disk) AS image, CONCAT('/', df_backdrop.filename_disk) AS backdrop, + json_build_object( + 'title', s.title, + 'image', CONCAT('/', df_art.filename_disk), + 'backdrop', CONCAT('/', df_backdrop.filename_disk), + 'url', s.slug, + 'alt', CONCAT(s.title, ' (', s.year, ')'), + 'subtext', CASE + WHEN MAX(e.season_number) IS NOT NULL AND MAX(e.episode_number) IS NOT NULL + THEN CONCAT('S', MAX(e.season_number), 'E', MAX(e.episode_number)) + ELSE s.year::TEXT + END + ) AS grid, + json_build_object( 'type', 'tv', 'title', s.title,