eleventy-plugin-podcaster 2.0.0-alpha.3 → 2.0.0-alpha.4

package/eleventy.config.js

@@ -1,3 +1,5 @@
+import path from 'node:path'
+
 import podcastFeed from './src/podcastFeed.js'
 import podcastData from './src/podcastData.js'
 import episodeData from './src/episodeData.js'
@@ -10,6 +12,11 @@ import drafts from './src/drafts.js'
 import pageTitle from './src/pageTitle.js'
 
 export default function (eleventyConfig, options = {}) {
+  const episodePostsDirectory = options.episodePostsDirectory ?? 'episode-posts'
+  options.episodePostsDirectory = path.join(eleventyConfig.directories.input, episodePostsDirectory)
+  const episodeFilesDirectory = options.episodeFilesDirectory ?? 'episode-files'
+  options.episodeFilesDirectory = path.join(eleventyConfig.directories.input, episodeFilesDirectory)
+
   eleventyConfig.addPlugin(podcastFeed, options)
   eleventyConfig.addPlugin(podcastData, options)
   eleventyConfig.addPlugin(episodeData, options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eleventy-plugin-podcaster",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "An Eleventy plugin that allows you to create a podcast and its accompanying website",
   "main": "eleventy.config.js",
   "exports": {
@@ -32,7 +32,6 @@
     "@11ty/eleventy-plugin-rss": "^2.0.1",
     "@aws-sdk/client-s3": "^3.862.0",
     "@tsmx/human-readable": "^2.0.3",
-    "chalk": "^5.3.0",
     "dom-serializer": "^2.0.0",
     "htmlparser2": "^9.1.0",
     "luxon": "^3.4.4",

package/src/calculateEpisodeFilename.js

@@ -1,7 +1,9 @@
+import isEpisodePost from './isEpisodePost.js'
+
 function findMatchingFilename (episodeData, thisEpisode) {
   const filenameSeasonAndEpisodePattern =
-    /^.*?\b[sS](?<seasonNumber>\d+)\s*[eE](?<episodeNumber>\d+)\b.*\.mp3$/
-  const filenameEpisodePattern = /^.*?\b(?<episodeNumber>\d+)\b.*\.mp3$/
+    /^.*?\b[sS](?<seasonNumber>\d+)\s*[eE](?<episodeNumber>\d+)\b.*\.(mp3|m4a)$/
+  const filenameEpisodePattern = /^.*?\b(?<episodeNumber>\d+)\b.*\.(mp3|m4a)$/
   const { seasonNumber, episodeNumber } = thisEpisode
 
   for (const file of Object.keys(episodeData)) {
@@ -27,11 +29,11 @@ function findMatchingFilename (episodeData, thisEpisode) {
   }
 }
 
-export default function (eleventyConfig, _options) {
+export default function (eleventyConfig, options) {
   eleventyConfig.addGlobalData('eleventyComputed.episode.filename', () => {
     return data => {
       if (data.episode.filename) return data.episode.filename
-      if (!data.page.inputPath.includes('/episodePosts/')) return
+      if (!isEpisodePost(data, options)) return
 
       return findMatchingFilename(data.episodeData, data.episode)
     }

package/src/calculateEpisodeSizeAndDuration.js

@@ -6,7 +6,10 @@ import { Writable } from 'node:stream'
 import { S3Client, ListObjectsCommand, GetObjectCommand, PutObjectCommand } from '@aws-sdk/client-s3'
 import { parseFile as parseFileMetadata, parseBuffer as parseBufferMetadata } from 'music-metadata'
 import hr from '@tsmx/human-readable'
-import chalk from 'chalk'
+import isEpisodePost from './isEpisodePost.js'
+
+const isAudioFile = episodeFilename => episodeFilename.endsWith('.mp3') ||
+                    episodeFilename.endsWith('.m4a')
 
 const convertSecondsToReadableDuration = seconds =>
   Duration.fromMillis(seconds * 1000)
@@ -35,7 +38,7 @@ async function readEpisodeDataLocally (episodeFilesDirectory) {
   const episodes = await readdir(episodeFilesDirectory)
   const episodeData = {}
   for (const episode of episodes) {
-    if (!episode.endsWith('.mp3')) continue
+    if (!isAudioFile(episode)) continue
 
     const episodePath = path.join(episodeFilesDirectory, episode)
     const episodeSize = (await stat(episodePath)).size
@@ -59,7 +62,7 @@ function calculatePodcastData (episodeData) {
 
 function reportPodcastData (podcastData) {
   const { numberOfEpisodes, totalSize, totalDuration } = podcastData
-  console.log(chalk.yellow(`${numberOfEpisodes} episodes; ${hr.fromBytes(totalSize)}; ${convertSecondsToReadableDuration(totalDuration)}.`))
+  console.log(`\u001b[33m${numberOfEpisodes} episodes; ${hr.fromBytes(totalSize)}; ${convertSecondsToReadableDuration(totalDuration)}.\u001b[0m`)
 }
 
 async function writePodcastDataLocally (episodeData, podcastData, directories) {
@@ -130,7 +133,7 @@ async function updateEpisodeDataFromS3Bucket (s3Client, s3Bucket) {
   const list = await s3Client.send(new ListObjectsCommand({ Bucket: s3Bucket }))
   const result = { ...storedEpisodeData.episodeData }
   for (const item of list.Contents ?? []) {
-    if (!item.Key.endsWith('.mp3')) continue
+    if (!isAudioFile(item.Key)) continue
 
     const { Key: filename, Size: size, LastModified: lastModified } = item
 
@@ -163,7 +166,7 @@ export default function (eleventyConfig, options = {}) {
     if (!firstRun || process.env.SKIP_EPISODE_CALCULATIONS === 'true') return
     firstRun = false
 
-    const episodeFilesDirectory = path.join(directories.input, 'episodeFiles')
+    const episodeFilesDirectory = options.episodeFilesDirectory
     let episodeData
     if (existsSync(episodeFilesDirectory)) {
       episodeData = await readEpisodeDataLocally(episodeFilesDirectory)
@@ -183,7 +186,7 @@ export default function (eleventyConfig, options = {}) {
   eleventyConfig.addGlobalData('eleventyComputed.episode.size', () => {
     return data => {
       if (data.episode.size) return data.episode.size
-      if (data.page.inputPath.includes('/episodePosts/') && data.episodeData) {
+      if (isEpisodePost(data, options) && data.episodeData) {
         return data.episodeData[data.episode.filename]?.size
       }
     }
@@ -196,7 +199,7 @@ export default function (eleventyConfig, options = {}) {
         return convertedReadableDuration ?? data.episode.duration
       }
 
-      if (data.page.inputPath.includes('/episodePosts/') && data.episodeData) {
+      if (isEpisodePost(data, options) && data.episodeData) {
         return data.episodeData[data.episode.filename]?.duration
       }
     }

package/src/episodeData.js

@@ -1,3 +1,5 @@
+import isEpisodePost from './isEpisodePost.js'
+
 export default function (eleventyConfig, options = {}) {
   const postFilenameSeasonAndEpisodePattern =
     /^[sS](?<seasonNumber>\d+)[eE](?<episodeNumber>\d+)/i
@@ -7,7 +9,7 @@ export default function (eleventyConfig, options = {}) {
     return data => {
       if (data.episode?.seasonNumber) return data.episode.seasonNumber
 
-      if (!data.page.inputPath.includes('/episodePosts/')) return
+      if (!isEpisodePost(data, options)) return
 
       const seasonAndEpisodeMatch = data.page.fileSlug.match(postFilenameSeasonAndEpisodePattern)
       if (seasonAndEpisodeMatch) {
@@ -20,7 +22,7 @@ export default function (eleventyConfig, options = {}) {
     return data => {
       if (data.episode?.episodeNumber) return data.episode.episodeNumber
 
-      if (!data.page.inputPath.includes('/episodePosts/')) return
+      if (!isEpisodePost(data, options)) return
 
       const seasonAndEpisodeMatch = data.page.fileSlug.match(postFilenameSeasonAndEpisodePattern)
       if (seasonAndEpisodeMatch) {
@@ -49,7 +51,7 @@ export default function (eleventyConfig, options = {}) {
 
   eleventyConfig.addGlobalData('eleventyComputed.episode.url', () => {
     return data => {
-      if (!data.page.inputPath.includes('/episodePosts/')) return
+      if (!isEpisodePost(data, options)) return
 
       const episodeUrlBase = data.podcast.episodeUrlBase
       const filename = data.episode.filename

package/src/excerpts.js

@@ -1,11 +1,12 @@
 import * as htmlparser2 from 'htmlparser2'
 import render from 'dom-serializer'
 import markdownIt from 'markdown-it'
+import isEpisodePost from './isEpisodePost.js'
 
 export default function (eleventyConfig, options = {}) {
   eleventyConfig.addGlobalData('eleventyComputed.excerpt', () => {
     return (data) => {
-      if (!data.page.inputPath.includes('/episodePosts/')) return
+      if (!isEpisodePost(data, options)) return
 
       const md = markdownIt({
         html: true,

package/src/isEpisodePost.js

@@ -0,0 +1,10 @@
+import path from 'node:path'
+
+export default function isEpisodePost (data, options) {
+  if (data.page?.inputPath) {
+    const importPath = path.normalize(data.page.inputPath)
+    return importPath.startsWith(options.episodePostsDirectory)
+  } else {
+    return false
+  }
+}

package/src/podcastFeed.js

@@ -1,6 +1,7 @@
 import rssPlugin from '@11ty/eleventy-plugin-rss'
 import { readFileSync } from 'node:fs'
 import path from 'node:path'
+import isEpisodePost from './isEpisodePost.js'
 
 export default function (eleventyConfig, options = {}) {
   if (!('addTemplate' in eleventyConfig)) {
@@ -12,7 +13,7 @@ export default function (eleventyConfig, options = {}) {
   eleventyConfig.addTemplate('feed.njk', readFileSync(podcastFeedPath), {
     eleventyExcludeFromCollections: true,
     eleventyImport: {
-      collections: ['podcastEpisode']
+      collections: ['episodePost']
     }
   })
 
@@ -22,7 +23,7 @@ export default function (eleventyConfig, options = {}) {
     }
   })
 
-  eleventyConfig.addCollection('podcastEpisode', (collectionApi) => {
-    return collectionApi.getFilteredByGlob('**/episodePosts/*')
+  eleventyConfig.addCollection('episodePost', (collectionApi) => {
+    return collectionApi.getAll().filter(item => isEpisodePost(item.data, options))
   })
 }

package/src/podcastFeed.njk

@@ -17,7 +17,7 @@ eleventyAllowMissingExtension: true
     <description>{{ podcast.description }}</description>
     <language>{{ podcast.language }}</language>
     <copyright>{{ podcast.copyrightNotice }}</copyright>
-    <pubDate>{{ collections.podcastEpisode | getNewestCollectionItemDate | dateToRfc3339 }}</pubDate>
+    <pubDate>{{ collections.episodePost | getNewestCollectionItemDate | dateToRfc3339 }}</pubDate>
     <lastBuildDate>{{ podcast.feedLastBuildDate }}</lastBuildDate>
     <itunes:image href="{{ podcast.imagePath | htmlBaseUrl(siteUrl) }}"></itunes:image>
     {%- if podcast.subcategory %}
@@ -47,7 +47,7 @@ eleventyAllowMissingExtension: true
     </itunes:owner>
     {%- endif %}
 
-    {% for post in collections.podcastEpisode | reverse %}
+    {% for post in collections.episodePost | reverse %}
     <item>
       <title>{{ post.data.episode.title or post.data.title }}</title>
       {% if post.data.episode.itunesTitle %}