chore: consolidate search/all/sitemap collections; filter out future albums from artist pages if they don't have plays

2024-07-16 15:07:23 -07:00 · 2024-07-16 15:07:23 -07:00 · a8beefaa4a
commit a8beefaa4a
parent fc9467de1b
4 changed files with 94 additions and 105 deletions
--- a/.eleventy.js
+++ b/.eleventy.js
@ -7,7 +7,7 @@ import markdownItFootnote from 'markdown-it-footnote'
 import htmlmin from 'html-minifier-terser'
 import filters from './config/filters/index.js'
 import { copy404Page, minifyJsComponents } from './config/events/index.js'
-import { allContent, popularPosts, searchIndex, siteMap } from './config/collections/index.js'
+import { popularPosts, processContent } from './config/collections/index.js'
 import { DateTime } from 'luxon'

 // load .env
@ -53,10 +53,19 @@ export default async function (eleventyConfig) {
  })

  // collections
-  eleventyConfig.addCollection('allContent', allContent)
  eleventyConfig.addCollection('popularPosts', popularPosts)
-  eleventyConfig.addCollection('searchIndex', searchIndex)
-  eleventyConfig.addCollection('siteMap', siteMap)
+  eleventyConfig.addCollection('allContent', (collection) => {
+    const { allContent } = processContent(collection)
+    return allContent
+  })
+  eleventyConfig.addCollection('searchIndex', (collection) => {
+    const { searchIndex } = processContent(collection)
+    return searchIndex
+  })
+  eleventyConfig.addCollection('siteMap', (collection) => {
+    const { siteMap } = processContent(collection)
+    return siteMap
+  })

  const md = markdownIt({ html: true, linkify: true })
  md.use(markdownItAnchor, {
--- a/config/collections/index.js
+++ b/config/collections/index.js
@ -23,46 +23,30 @@ const tagsToHashtags = (tags) => {
  return hashtags.join(' ');
 }

-export const searchIndex = (collection) => {
+export const popularPosts = (collection) => {
+  const collectionData = collection.getAll()[0]
+  const { data } = collectionData
+  const { posts, analytics } = data
+
+  return posts
+    .filter((post) => {
+      if (analytics.find((p) => p.page.includes(post.slug))) return true
+    })
+    .sort((a, b) => {
+      const visitors = (page) => analytics.filter((p) => p.page.includes(page.slug)).pop()?.visitors
+      return visitors(b) - visitors(a)
+    })
+}
+
+export const processContent = (collection) => {
  const searchIndex = []
+  const aggregateContent = []
+  const siteMapContent = []
  let id = 0
  const collectionData = collection.getAll()[0]
  const { data } = collectionData
-  const { posts, links, movies, books } = data
-  const movieData = movies['movies'].filter(movie => (movie['review']?.length && movie['review']?.length > 0 && movie['rating']))
-  const bookData = books.all.filter(book => (book['review']?.length && book['review']?.length > 0 && book['rating']))
-  const addItemToIndex = (items, icon, getUrl, getTitle, getTags) => {
-    if (items) {
-      items.forEach((item) => {
-        searchIndex.push({
-          id,
-          url: getUrl(item),
-          title: `${icon}: ${getTitle(item)}`,
-          tags: getTags ? getTags(item) : [],
-        })
-        id++
-      })
-    }
-  }
+  const { posts, links, movies, books, pages, artists, genres, tv } = data

-  addItemToIndex(posts, '📝', item => new URL(item['slug'], BASE_URL).toString(), item => item['title'], item => item['tags'])
-  addItemToIndex(links, '🔗', item => item['link'], item => item['title'], item => item['tags'])
-  if (movieData) addItemToIndex(movieData, '🎥', item => item['url'], item => `${item['title']} (${item['rating']})`, item => item['tags'])
-  if (bookData) addItemToIndex(bookData, '📖', item => item['url'], item => `${item['title']} (${item['rating']})`, item => item['tags'])
-
-  return searchIndex
-}
-
-export const allContent = (collection) => {
-  const aggregateContent = []
-  const collectionData = collection.getAll()[0]
-  const { data } = collectionData
-  const {
-    posts,
-    links,
-    books,
-    movies: { movies }
-  } = data
  const parseDate = (date) => {
    if (!date) return null
    let parsedDate = DateTime.fromISO(date)
@ -71,10 +55,25 @@ export const allContent = (collection) => {
    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'dd-MM-yyyy')
    return parsedDate.isValid ? parsedDate.toISO() : null
  }
+
+  const addItemToIndex = (items, icon, getUrl, getTitle, getTags) => {
+    if (items) {
+      items.forEach((item) => {
+        searchIndex.push({
+          id,
+          url: getUrl(item),
+          title: `${icon}: ${getTitle(item)}`,
+          tags: getTags ? getTags(item) : []
+        })
+        id++
+      })
+    }
+  }
+
  const addContent = (items, icon, getTitle, getDate) => {
    if (items) {
-      items.forEach(item => {
-        let attribution;
+      items.forEach((item) => {
+        let attribution

        if (item?.['authors']?.['mastodon']) {
          const mastoUrl = new URL(item['authors']['mastodon'])
@ -102,53 +101,11 @@ export const allContent = (collection) => {
    }
  }

-  addContent(posts, '📝', item => item['title'], item => item['date'])
-  addContent(links, '🔗', item => item['title'], item => item['date'])
-  addContent(books.all.filter(book => book['status'] === 'finished'), '📖', item => `${item['title']}${item['rating'] ? ' (' + item['rating'] + ')' : ''}`, item => item['date'])
-  addContent(movies, '🎥', item => `${item['title']}${item['rating'] ? ' (' + item['rating'] + ')' : ''}`, item => item['lastWatched'])
+  const addSiteMapContent = (items, getTitle, getDate) => {
+    const addedUrls = new Set()

-  return aggregateContent.sort((a, b) => {
-    const dateA = a['date'] ? DateTime.fromISO(a['date']) : DateTime.fromMillis(0)
-    const dateB = b['date'] ? DateTime.fromISO(b['date']) : DateTime.fromMillis(0)
-    return dateB - dateA
-  })
-}
-
-export const popularPosts = (collection) => {
-  const collectionData = collection.getAll()[0]
-  const { data } = collectionData
-  const { posts, analytics } = data
-
-  return posts
-    .filter((post) => {
-      if (analytics.find((p) => p.page.includes(post.slug))) return true
-    })
-    .sort((a, b) => {
-      const visitors = (page) => analytics.filter((p) => p.page.includes(page.slug)).pop()?.visitors
-      return visitors(b) - visitors(a)
-    })
-}
-
-export const siteMap = (collection) => {
-  const aggregateContent = []
-  const collectionData = collection.getAll()[0]
-  const { data } = collectionData
-  const { posts, pages, artists, genres, movies, tv, books } = data
-
-  const parseDate = (date) => {
-    if (!date) return null
-    let parsedDate = DateTime.fromISO(date)
-    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'yyyy-MM-dd')
-    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'MM/dd/yyyy')
-    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'dd-MM-yyyy')
-    return parsedDate.isValid ? parsedDate.toISO() : null
-  }
-
-  const addedUrls = new Set()
-
-  const addContent = (items, getTitle, getDate) => {
    if (items) {
-      items.forEach(item => {
+      items.forEach((item) => {
        let url
        if (item?.['url']) url = item['url']
        if (item?.['permalink']) url = item['permalink']
@ -160,27 +117,44 @@ export const siteMap = (collection) => {
          title: getTitle(item),
          date: getDate ? parseDate(getDate(item)) : null
        }
-        aggregateContent.push(content)
+        siteMapContent.push(content)
        addedUrls.add(url)
      })
    }
  }

-  if (posts) addContent(posts, item => item.title, item => item.date)
-  if (pages) addContent(pages, item => item.title, item => item.date)
-  if (artists) addContent(artists, item => item.name, item => item.date)
-  if (genres) addContent(genres, item => item.name, item => item.date)
-  if (movies?.['movies']) addContent(movies['movies'], item => item.title, item => item.date)
-  if (books?.['all']) addContent(books['all'], item => item.title, item => item.date)
-  if (tv?.['shows']) addContent(tv['shows'], item => item.title, item => item.date)
+  const movieData = movies['movies'].filter((movie) => movie['review']?.length && movie['rating'])
+  const bookData = books.all.filter((book) => book['review']?.length && book['rating'])

-  collection.getAll().forEach(item => {
-    if (item.data.pages) addContent(item.data.pages, item => item.title, item => item.date)
-  })
+  addItemToIndex(posts, '📝', (item) => new URL(item['slug'], BASE_URL).toString(), (item) => item['title'], (item) => item['tags'])
+  addItemToIndex(links, '🔗', (item) => item['link'], (item) => item['title'], (item) => item['tags'])
+  if (movieData) addItemToIndex(movieData, '🎥', (item) => item['url'], (item) => `${item['title']} (${item['rating']})`, (item) => item['tags'])
+  if (bookData) addItemToIndex(bookData, '📖', (item) => item['url'], (item) => `${item['title']} (${item['rating']})`, (item) => item['tags'])

-  return aggregateContent.sort((a, b) => {
-    const dateA = a.date ? DateTime.fromISO(a.date) : DateTime.fromMillis(0)
-    const dateB = b.date ? DateTime.fromISO(b.date) : DateTime.fromMillis(0)
-    return dateB - dateA
-  })
+  addContent(posts, '📝', (item) => item['title'], (item) => item['date'])
+  addContent(links, '🔗', (item) => item['title'], (item) => item['date'])
+  addContent(books.all.filter((book) => book['status'] === 'finished'), '📖', (item) => `${item['title']}${item['rating'] ? ' (' + item['rating'] + ')' : ''}`, (item) => item['date'])
+  addContent(movies['movies'], '🎥', (item) => `${item['title']}${item['rating'] ? ' (' + item['rating'] + ')' : ''}`, (item) => item['lastWatched'])
+
+  addSiteMapContent(posts, (item) => item.title, (item) => item.date)
+  addSiteMapContent(pages, (item) => item.title, (item) => item.date)
+  addSiteMapContent(artists, (item) => item.name, (item) => item.date)
+  addSiteMapContent(genres, (item) => item.name, (item) => item.date)
+  addSiteMapContent(movies['movies'], (item) => item.title, (item) => item.date)
+  addSiteMapContent(books.all, (item) => item.title, (item) => item.date)
+  addSiteMapContent(tv?.['shows'], (item) => item.title, (item) => item.date)
+
+  return {
+    searchIndex,
+    allContent: aggregateContent.sort((a, b) => {
+      const dateA = a['date'] ? DateTime.fromISO(a['date']) : DateTime.fromMillis(0)
+      const dateB = b['date'] ? DateTime.fromISO(b['date']) : DateTime.fromMillis(0)
+      return dateB - dateA
+    }),
+    siteMap: siteMapContent.sort((a, b) => {
+      const dateA = a['date'] ? DateTime.fromISO(a['date']) : DateTime.fromMillis(0)
+      const dateB = b['date'] ? DateTime.fromISO(b['date']) : DateTime.fromMillis(0)
+      return dateB - dateA
+    })
+  }
 }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "coryd.dev",
-  "version": "20.9.4",
+  "version": "20.10.0",
  "description": "The source for my personal site. Built using 11ty (and other tools).",
  "type": "module",
  "scripts": {
@ -26,7 +26,7 @@
    "youtube-video-element": "^1.1.6"
  },
  "devDependencies": {
-    "@11ty/eleventy": "3.0.0-alpha.16",
+    "@11ty/eleventy": "3.0.0-alpha.17",
    "@11ty/eleventy-fetch": "^4.0.1",
    "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0",
    "@11tyrocks/eleventy-plugin-lightningcss": "^1.4.0",
--- a/src/data/artists.js
+++ b/src/data/artists.js
@ -1,5 +1,6 @@
 import { createClient } from '@supabase/supabase-js'
 import { sanitizeMediaString, parseCountryField } from '../../config/utilities/index.js'
+import { DateTime } from 'luxon'

 const SUPABASE_URL = process.env.SUPABASE_URL
 const SUPABASE_KEY = process.env.SUPABASE_KEY
@ -55,7 +56,12 @@ const fetchGenreMapping = async () => {
 export default async function () {
  const genreMapping = await fetchGenreMapping()
  const artists = await fetchPaginatedData('artists', 'id, mbid, name_string, art(filename_disk), total_plays, country, description, favorite, tattoo, genres')
-  const albums = await fetchPaginatedData('albums', 'mbid, name, release_year, total_plays, artist')
+  const allAlbums = await fetchPaginatedData('albums', 'id, mbid, name, release_year, total_plays, artist, release_date')
+  const albums = allAlbums.filter(album =>
+    !album['release_date'] ||
+    DateTime.fromISO(album['release_date']) <= DateTime.now() ||
+    (DateTime.fromISO(album['release_date']) > DateTime.now() && album['total_plays'] > 0)
+  )
  const albumsByArtist = albums.reduce((acc, album) => {
    if (!acc[album['artist']]) acc[album['artist']] = []
    acc[album['artist']].push({