eleventy-plugin-podcaster 1.1.0 → 1.2.1

package/README.md

@@ -10,7 +10,7 @@ Plenty of services exist that will host your podcast online — [Spotify][], [Ac
 [Buzzsprout]: https://www.buzzsprout.com
 [Blubrry]: https://blubrry.com
 
-But **Podcaster** will.
+But Eleventy and **Podcaster** will.
 
 ## Installation
 

package/eleventy.config.js

@@ -3,7 +3,7 @@ import hr from '@tsmx/human-readable'
 import rssPlugin from '@11ty/eleventy-plugin-rss'
 import { readFileSync } from 'node:fs'
 import path from 'node:path'
-import calculateSizeAndDuration from './src/calculateSizeAndDuration.js'
+import calculateFilenameSizeAndDuration from './src/calculateFilenameSizeAndDuration.js'
 import excerpts from './src/excerpts.js'
 import drafts from './src/drafts.js'
 
@@ -26,7 +26,7 @@ export default function (eleventyConfig, options = {}) {
     return data => data.podcast.imagePath || '/img/podcast-logo.jpg'
   })
 
-  eleventyConfig.addGlobalData('eleventyComputed.podcast.copyrightNotice', () => {
+  function calculateCopyrightNotice () {
     return data => {
       const thisYear = DateTime.now().year
       let yearRange
@@ -37,7 +37,17 @@ export default function (eleventyConfig, options = {}) {
       }
       return `© ${yearRange} ${data.podcast.copyright || data.podcast.author}`
     }
-  })
+  }
+
+  eleventyConfig.addGlobalData(
+    'eleventyComputed.podcast.copyrightNotice',
+    calculateCopyrightNotice
+  )
+
+  eleventyConfig.addGlobalData(
+    'eleventyComputed.copyrightNotice',
+    calculateCopyrightNotice
+  )
 
   eleventyConfig.addGlobalData(
     'podcast.feedLastBuildDate',
@@ -102,7 +112,7 @@ export default function (eleventyConfig, options = {}) {
     }
   })
 
-  eleventyConfig.addPlugin(calculateSizeAndDuration, options)
+  eleventyConfig.addPlugin(calculateFilenameSizeAndDuration, options)
   eleventyConfig.addPlugin(excerpts, options)
   eleventyConfig.addPlugin(drafts, options)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eleventy-plugin-podcaster",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "An Eleventy plugin that allows you to create a podcast and its accompanying website",
   "main": "eleventy.config.js",
   "exports": {

package/src/{calculateSizeAndDuration.js → calculateFilenameSizeAndDuration.js}

@@ -48,6 +48,29 @@ export default function (eleventyConfig, options = {}) {
     console.log(chalk.yellow(`${totalEpisodes} episodes; ${hr.fromBytes(totalSize)}; ${convertSecondsToReadableDuration(totalDuration)}.`))
   })
 
+  if (options.episodeFilenamePattern) {
+    eleventyConfig.addGlobalData('eleventyComputed.episode.filename', () => {
+      return data => {
+        if (data.episode.filename) return data.episode.filename
+
+        if (data.tags?.includes('podcastEpisode') && data.episodesData) {
+          for (const file of Object.keys(data.episodesData)) {
+            const match = file.match(options.episodeFilenamePattern)
+            const matchedSeasonNumber = parseInt(match?.groups.seasonNumber)
+            const matchedEpisodeNumber = parseInt(match?.groups.episodeNumber)
+            if (isNaN(matchedSeasonNumber) && matchedEpisodeNumber ===
+                data.episode.episodeNumber) {
+              return file
+            } else if (matchedSeasonNumber === data.episode.seasonNumber &&
+                       matchedEpisodeNumber === data.episode.episodeNumber) {
+              return file
+            }
+          }
+        }
+      }
+    })
+  }
+
   eleventyConfig.addGlobalData('eleventyComputed.episode.size', () => {
     return data => {
       if (data.episode.size) return data.episode.size

package/src/podcastFeed.njk

@@ -55,15 +55,16 @@ eleventyAllowMissingExtension: true
       {%- endif %}
       <link>{{ post.url | htmlBaseUrl(siteUrl) }}</link>
       {%- if post.data.guid != undefined %}
-      <guid isPermalink="false">{{ post.data.guid }}</guid>
+      <guid isPermaLink="false">{{ post.data.guid }}</guid>
       {% else %}
-      <guid isPermalink="true">{{ post.url | htmlBaseUrl(siteUrl) }}</guid>
+      <guid isPermaLink="true">{{ post.url | htmlBaseUrl(siteUrl) }}</guid>
       {% endif -%}
       <pubDate>{{ post.date | dateToRfc3339 }}</pubDate>
       {% if podcast.episodeDescriptionTemplate %}
       {%- set episodeDescription -%}
       {% include podcast.episodeDescriptionTemplate %}
       {%- endset -%}
+      {%- set episodeDescription = episodeDescription | replace('&amp;', '&') %}
       {% elif post.data.episode.description %}
       {%- set episodeDescription = post.data.episode.description -%}
       {% else %}