podcast-dl 11.6.1 → 11.7.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 Joshua Pohl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 Joshua Pohl
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/bin/archive.js

@@ -1,39 +1,51 @@
-import dayjs from "dayjs";
-import fs from "fs";
-import path from "path";
-import { getJsonFile } from "./util.js";
-
-export const getArchiveKey = ({ prefix, name }) => {
-  return `${prefix}-${name}`;
-};
-
-export const getArchive = (archive) => {
-  const archiveContent = getJsonFile(archive);
-  return archiveContent === null ? [] : archiveContent;
-};
-
-export const writeToArchive = ({ key, archive }) => {
-  const archivePath = path.resolve(process.cwd(), archive);
-  const archiveResult = getArchive(archive);
-
-  if (!archiveResult.includes(key)) {
-    archiveResult.push(key);
-  }
-
-  fs.writeFileSync(archivePath, JSON.stringify(archiveResult, null, 4));
-};
-
-export const getIsInArchive = ({ key, archive }) => {
-  const archiveResult = getArchive(archive);
-  return archiveResult.includes(key);
-};
-
-export const getArchiveFilename = ({ pubDate, name, ext }) => {
-  const formattedPubDate = pubDate
-    ? dayjs(new Date(pubDate)).format("YYYYMMDD")
-    : null;
-
-  const baseName = formattedPubDate ? `${formattedPubDate}-${name}` : name;
-
-  return `${baseName}${ext}`;
-};
+import dayjs from "dayjs";
+import fs from "fs";
+import path from "path";
+import { getJsonFile } from "./util.js";
+
+export const getArchiveKey = ({ prefix, name }) => {
+  return `${prefix}-${name}`;
+};
+
+export const getArchiveKeys = ({ prefix, name, guid }) => {
+  const legacyKey = name ? getArchiveKey({ prefix, name }) : null;
+  const guidKey = guid ? getArchiveKey({ prefix, name: guid }) : null;
+  return [legacyKey, guidKey].filter(Boolean);
+};
+
+export const getArchive = (archive) => {
+  const archiveContent = getJsonFile(archive);
+  return archiveContent === null ? [] : archiveContent;
+};
+
+export const writeToArchive = ({ key, archiveKeys, archive }) => {
+  const archivePath = path.resolve(process.cwd(), archive);
+  const archiveResult = getArchive(archive);
+  const keys = Array.from(
+    new Set([key, ...(archiveKeys || [])].filter(Boolean))
+  );
+
+  keys.forEach((archiveKey) => {
+    if (!archiveResult.includes(archiveKey)) {
+      archiveResult.push(archiveKey);
+    }
+  });
+
+  fs.writeFileSync(archivePath, JSON.stringify(archiveResult, null, 4));
+};
+
+export const getIsInArchive = ({ key, archiveKeys, archive }) => {
+  const archiveResult = getArchive(archive);
+  const keys = [key, ...(archiveKeys || [])].filter(Boolean);
+  return keys.some((archiveKey) => archiveResult.includes(archiveKey));
+};
+
+export const getArchiveFilename = ({ pubDate, name, ext }) => {
+  const formattedPubDate = pubDate
+    ? dayjs(new Date(pubDate)).format("YYYYMMDD")
+    : null;
+
+  const baseName = formattedPubDate ? `${formattedPubDate}-${name}` : name;
+
+  return `${baseName}${ext}`;
+};

package/bin/async.js

@@ -7,7 +7,7 @@ import { throttle } from "throttle-debounce";
 import { promisify } from "util";
 import {
   getArchiveFilename,
-  getArchiveKey,
+  getArchiveKeys,
   getIsInArchive,
   writeToArchive,
 } from "./archive.js";
@@ -39,7 +39,7 @@ export const download = async (options) => {
     marker,
     url,
     outputPath,
-    key,
+    archiveKeys = [],
     archive,
     override,
     alwaysPostprocess,
@@ -61,7 +61,11 @@ export const download = async (options) => {
     return outputPath;
   }
 
-  if (key && archive && getIsInArchive({ key, archive })) {
+  if (
+    archive &&
+    archiveKeys.length &&
+    getIsInArchive({ archiveKeys, archive })
+  ) {
     logMessage("Download exists in archive. Skipping...");
     return null;
   }
@@ -149,11 +153,10 @@ export const download = async (options) => {
     return null;
   }
 
-  const { outputPath: finalOutputPath, key: finalKey } = trustExt
-    ? { outputPath, key }
+  const finalOutputPath = trustExt
+    ? outputPath
     : correctExtensionFromMime({
         outputPath,
-        key,
         contentType: headResponse?.headers?.["content-type"],
         onCorrect: (from, to) =>
           logMessage(
@@ -170,9 +173,9 @@ export const download = async (options) => {
     await onAfterDownload(finalOutputPath);
   }
 
-  if (finalKey && archive) {
+  if (archive && archiveKeys.length) {
     try {
-      writeToArchive({ key: finalKey, archive });
+      writeToArchive({ archiveKeys, archive });
     } catch (error) {
       throw new Error(`Error writing to archive: ${error.toString()}`);
     }
@@ -245,14 +248,7 @@ export const downloadItemsAsync = async ({
         marker,
         trustExt,
         userAgent,
-        key: getArchiveKey({
-          prefix: archivePrefix,
-          name: getArchiveFilename({
-            name: item.title,
-            pubDate: item.pubDate,
-            ext: audioFileExt,
-          }),
-        }),
+        archiveKeys: item._archiveKeys || [],
         maxAttempts: attempts,
         outputPath: outputPodcastPath,
         url: episodeAudioUrl,
@@ -264,7 +260,7 @@ export const downloadItemsAsync = async ({
                 override,
                 trustExt,
                 userAgent,
-                key: item._episodeImage.key,
+                archiveKeys: item._episodeImage.archiveKeys || [],
                 marker: item._episodeImage.url,
                 maxAttempts: attempts,
                 outputPath: item._episodeImage.outputPath,
@@ -289,7 +285,7 @@ export const downloadItemsAsync = async ({
               const finalTranscriptPath = await download({
                 archive,
                 override,
-                key: item._episodeTranscript.key,
+                archiveKeys: item._episodeTranscript.archiveKeys || [],
                 marker: item._episodeTranscript.url,
                 maxAttempts: attempts,
                 outputPath: item._episodeTranscript.outputPath,
@@ -371,13 +367,14 @@ export const downloadItemsAsync = async ({
                 archive,
                 override,
                 item,
-                key: getArchiveKey({
+                archiveKeys: getArchiveKeys({
                   prefix: archivePrefix,
                   name: getArchiveFilename({
                     pubDate: item.pubDate,
                     name: item.title,
                     ext: episodeMetaExt,
                   }),
+                  guid: item.guid ? `${item.guid}-meta` : null,
                 }),
                 outputPath: outputEpisodeMetaPath,
               });

package/bin/bin.js

@@ -164,10 +164,12 @@ const main = async () => {
           trustExt,
           userAgent,
           marker: podcastImageUrl,
-          key: getArchiveKey({
-            prefix: archivePrefix,
-            name: `${feed.title || "image"}${podcastImageFileExt}`,
-          }),
+          archiveKeys: [
+            getArchiveKey({
+              prefix: archivePrefix,
+              name: `${feed.title || "image"}${podcastImageFileExt}`,
+            }),
+          ],
           outputPath: outputImagePath,
           url: podcastImageUrl,
           maxAttempts: attempts,

package/bin/exec.js

@@ -1,30 +1,30 @@
-import { exec } from "child_process";
-import util from "util";
-import { escapeArgForShell } from "./util.js";
-
-export const execWithPromise = util.promisify(exec);
-
-export const runExec = async ({
-  exec,
-  basePath,
-  outputPodcastPath,
-  episodeFilename,
-  episodeAudioUrl,
-}) => {
-  const episodeFilenameBase = episodeFilename.substring(
-    0,
-    episodeFilename.lastIndexOf(".")
-  );
-
-  const execCmd = exec
-    .replace(/{{episode_path}}/g, escapeArgForShell(outputPodcastPath))
-    .replace(/{{episode_path_base}}/g, escapeArgForShell(basePath))
-    .replace(/{{episode_filename}}/g, escapeArgForShell(episodeFilename))
-    .replace(
-      /{{episode_filename_base}}/g,
-      escapeArgForShell(episodeFilenameBase)
-    )
-    .replace(/{{url}}/g, escapeArgForShell(episodeAudioUrl));
-
-  await execWithPromise(execCmd, { stdio: "ignore" });
-};
+import { exec } from "child_process";
+import util from "util";
+import { escapeArgForShell } from "./util.js";
+
+export const execWithPromise = util.promisify(exec);
+
+export const runExec = async ({
+  exec,
+  basePath,
+  outputPodcastPath,
+  episodeFilename,
+  episodeAudioUrl,
+}) => {
+  const episodeFilenameBase = episodeFilename.substring(
+    0,
+    episodeFilename.lastIndexOf(".")
+  );
+
+  const execCmd = exec
+    .replace(/{{episode_path}}/g, escapeArgForShell(outputPodcastPath))
+    .replace(/{{episode_path_base}}/g, escapeArgForShell(basePath))
+    .replace(/{{episode_filename}}/g, escapeArgForShell(episodeFilename))
+    .replace(
+      /{{episode_filename_base}}/g,
+      escapeArgForShell(episodeFilenameBase)
+    )
+    .replace(/{{url}}/g, escapeArgForShell(episodeAudioUrl));
+
+  await execWithPromise(execCmd, { stdio: "ignore" });
+};

package/bin/items.js

@@ -1,6 +1,6 @@
 import dayjs from "dayjs";
 import path from "path";
-import { getArchive, getArchiveFilename, getArchiveKey } from "./archive.js";
+import { getArchive, getArchiveFilename, getArchiveKeys } from "./archive.js";
 import { logErrorAndExit } from "./logger.js";
 import { getItemFilename } from "./naming.js";
 import {
@@ -48,7 +48,7 @@ export const getItemsToDownload = ({
   const savedArchive = archive ? getArchive(archive) : [];
 
   while (shouldGo(i)) {
-    const { title, pubDate, itunes } = feed.items[i];
+    const { title, pubDate, itunes, guid } = feed.items[i];
     const actualSeasonNum = itunes?.season ? parseInt(itunes.season) : null;
     const pubDateDay = dayjs(new Date(pubDate));
     let isValid = true;
@@ -94,16 +94,17 @@ export const getItemsToDownload = ({
     const { url: episodeAudioUrl, ext: audioFileExt } =
       getEpisodeAudioUrlAndExt(feed.items[i], episodeSourceOrder);
 
-    const key = getArchiveKey({
+    const archiveKeys = getArchiveKeys({
       prefix: archivePrefix,
       name: getArchiveFilename({
         pubDate,
         name: title,
         ext: audioFileExt,
       }),
+      guid,
     });
 
-    if (key && savedArchive.includes(key)) {
+    if (archiveKeys.some((archiveKey) => savedArchive.includes(archiveKey))) {
       isValid = false;
     }
 
@@ -111,19 +112,21 @@ export const getItemsToDownload = ({
       const item = feed.items[i];
       item._originalIndex = i;
       item.seasonNum = actualSeasonNum;
+      item._archiveKeys = archiveKeys;
 
       if (includeEpisodeImages || embedMetadataFlag) {
         const episodeImageUrl = getImageUrl(item);
 
         if (episodeImageUrl) {
           const episodeImageFileExt = getUrlExt(episodeImageUrl);
-          const episodeImageArchiveKey = getArchiveKey({
+          const episodeImageArchiveKeys = getArchiveKeys({
             prefix: archivePrefix,
             name: getArchiveFilename({
               pubDate,
               name: title,
               ext: episodeImageFileExt,
             }),
+            guid: guid ? `${guid}-image` : null,
           });
 
           const episodeImageName = getItemFilename({
@@ -141,7 +144,7 @@ export const getItemsToDownload = ({
           item._episodeImage = {
             url: episodeImageUrl,
             outputPath: outputImagePath,
-            key: episodeImageArchiveKey,
+            archiveKeys: episodeImageArchiveKeys,
           };
         }
       }
@@ -154,13 +157,14 @@ export const getItemsToDownload = ({
 
         if (episodeTranscriptUrl) {
           const episodeTranscriptFileExt = getUrlExt(episodeTranscriptUrl);
-          const episodeTranscriptArchiveKey = getArchiveKey({
+          const episodeTranscriptArchiveKeys = getArchiveKeys({
             prefix: archivePrefix,
             name: getArchiveFilename({
               pubDate,
               name: title,
               ext: episodeTranscriptFileExt,
             }),
+            guid: guid ? `${guid}-transcript` : null,
           });
 
           const episodeTranscriptName = getItemFilename({
@@ -181,7 +185,7 @@ export const getItemsToDownload = ({
           item._episodeTranscript = {
             url: episodeTranscriptUrl,
             outputPath: outputTranscriptPath,
-            key: episodeTranscriptArchiveKey,
+            archiveKeys: episodeTranscriptArchiveKeys,
           };
         }
       }

package/bin/logger.js

@@ -1,84 +1,84 @@
-/* eslint-disable no-console */
-
-export const ERROR_STATUSES = {
-  general: 1,
-  nothingDownloaded: 2,
-  completedWithErrors: 3,
-};
-
-export const LOG_LEVEL_TYPES = {
-  debug: "debug",
-  quiet: "quiet",
-  silent: "silent",
-  static: "static",
-};
-
-export const LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  important: 2,
-};
-
-export const getShouldOutputProgressIndicator = () => {
-  return (
-    process.stdout.isTTY &&
-    process.env.LOG_LEVEL !== LOG_LEVEL_TYPES.static &&
-    process.env.LOG_LEVEL !== LOG_LEVEL_TYPES.quiet &&
-    process.env.LOG_LEVEL !== LOG_LEVEL_TYPES.silent
-  );
-};
-
-export const logMessage = (message = "", logLevel = 1) => {
-  if (
-    !process.env.LOG_LEVEL ||
-    process.env.LOG_LEVEL === LOG_LEVEL_TYPES.debug ||
-    process.env.LOG_LEVEL === LOG_LEVEL_TYPES.static
-  ) {
-    console.log(message);
-    return;
-  }
-
-  if (process.env.LOG_LEVEL === LOG_LEVEL_TYPES.silent) {
-    return;
-  }
-
-  if (
-    process.env.LOG_LEVEL === LOG_LEVEL_TYPES.quiet &&
-    logLevel > LOG_LEVELS.info
-  ) {
-    console.log(message);
-    return;
-  }
-};
-
-export const getLogMessageWithMarker = (marker) => {
-  return (message, logLevel) => {
-    if (marker) {
-      logMessage(`${marker} | ${message}`, logLevel);
-    } else {
-      logMessage(message, logLevel);
-    }
-  };
-};
-
-export const logError = (msg, error) => {
-  if (process.env.LOG_LEVEL === LOG_LEVEL_TYPES.silent) {
-    return;
-  }
-
-  console.error(msg);
-
-  if (error) {
-    console.error(error.message);
-  }
-};
-
-export const logErrorAndExit = (msg, error) => {
-  console.error(msg);
-
-  if (error) {
-    console.error(error.message);
-  }
-
-  process.exit(ERROR_STATUSES.general);
-};
+/* eslint-disable no-console */
+
+export const ERROR_STATUSES = {
+  general: 1,
+  nothingDownloaded: 2,
+  completedWithErrors: 3,
+};
+
+export const LOG_LEVEL_TYPES = {
+  debug: "debug",
+  quiet: "quiet",
+  silent: "silent",
+  static: "static",
+};
+
+export const LOG_LEVELS = {
+  debug: 0,
+  info: 1,
+  important: 2,
+};
+
+export const getShouldOutputProgressIndicator = () => {
+  return (
+    process.stdout.isTTY &&
+    process.env.LOG_LEVEL !== LOG_LEVEL_TYPES.static &&
+    process.env.LOG_LEVEL !== LOG_LEVEL_TYPES.quiet &&
+    process.env.LOG_LEVEL !== LOG_LEVEL_TYPES.silent
+  );
+};
+
+export const logMessage = (message = "", logLevel = 1) => {
+  if (
+    !process.env.LOG_LEVEL ||
+    process.env.LOG_LEVEL === LOG_LEVEL_TYPES.debug ||
+    process.env.LOG_LEVEL === LOG_LEVEL_TYPES.static
+  ) {
+    console.log(message);
+    return;
+  }
+
+  if (process.env.LOG_LEVEL === LOG_LEVEL_TYPES.silent) {
+    return;
+  }
+
+  if (
+    process.env.LOG_LEVEL === LOG_LEVEL_TYPES.quiet &&
+    logLevel > LOG_LEVELS.info
+  ) {
+    console.log(message);
+    return;
+  }
+};
+
+export const getLogMessageWithMarker = (marker) => {
+  return (message, logLevel) => {
+    if (marker) {
+      logMessage(`${marker} | ${message}`, logLevel);
+    } else {
+      logMessage(message, logLevel);
+    }
+  };
+};
+
+export const logError = (msg, error) => {
+  if (process.env.LOG_LEVEL === LOG_LEVEL_TYPES.silent) {
+    return;
+  }
+
+  console.error(msg);
+
+  if (error) {
+    console.error(error.message);
+  }
+};
+
+export const logErrorAndExit = (msg, error) => {
+  console.error(msg);
+
+  if (error) {
+    console.error(error.message);
+  }
+
+  process.exit(ERROR_STATUSES.general);
+};

package/bin/meta.js

@@ -1,66 +1,74 @@
-import fs from "fs";
-import { getIsInArchive, writeToArchive } from "./archive.js";
-import { logMessage } from "./logger.js";
-import { getPublicObject } from "./util.js";
-
-export const writeFeedMeta = ({ outputPath, feed, key, archive, override }) => {
-  if (key && archive && getIsInArchive({ key, archive })) {
-    logMessage("Feed metadata exists in archive. Skipping...");
-    return;
-  }
-  const output = getPublicObject(feed, ["items"]);
-
-  try {
-    if (override || !fs.existsSync(outputPath)) {
-      fs.writeFileSync(outputPath, JSON.stringify(output, null, 4));
-    } else {
-      logMessage("Feed metadata exists locally. Skipping...");
-    }
-
-    if (key && archive && !getIsInArchive({ key, archive })) {
-      try {
-        writeToArchive({ key, archive });
-      } catch (error) {
-        throw new Error(`Error writing to archive: ${error.toString()}`);
-      }
-    }
-  } catch (error) {
-    throw new Error(
-      `Unable to save metadata file for feed: ${error.toString()}`
-    );
-  }
-};
-
-export const writeItemMeta = ({
-  marker,
-  outputPath,
-  item,
-  key,
-  archive,
-  override,
-}) => {
-  if (key && archive && getIsInArchive({ key, archive })) {
-    logMessage(`${marker} | Episode metadata exists in archive. Skipping...`);
-    return;
-  }
-
-  const output = getPublicObject(item);
-
-  try {
-    if (override || !fs.existsSync(outputPath)) {
-      fs.writeFileSync(outputPath, JSON.stringify(output, null, 4));
-    } else {
-      logMessage(`${marker} | Episode metadata exists locally. Skipping...`);
-    }
-
-    if (key && archive && !getIsInArchive({ key, archive })) {
-      try {
-        writeToArchive({ key, archive });
-      } catch (error) {
-        throw new Error("Error writing to archive", error);
-      }
-    }
-  } catch (error) {
-    throw new Error("Unable to save meta file for episode", error);
-  }
-};
+import fs from "fs";
+import { getIsInArchive, writeToArchive } from "./archive.js";
+import { logMessage } from "./logger.js";
+import { getPublicObject } from "./util.js";
+
+export const writeFeedMeta = ({ outputPath, feed, key, archive, override }) => {
+  if (key && archive && getIsInArchive({ key, archive })) {
+    logMessage("Feed metadata exists in archive. Skipping...");
+    return;
+  }
+  const output = getPublicObject(feed, ["items"]);
+
+  try {
+    if (override || !fs.existsSync(outputPath)) {
+      fs.writeFileSync(outputPath, JSON.stringify(output, null, 4));
+    } else {
+      logMessage("Feed metadata exists locally. Skipping...");
+    }
+
+    if (key && archive && !getIsInArchive({ key, archive })) {
+      try {
+        writeToArchive({ key, archive });
+      } catch (error) {
+        throw new Error(`Error writing to archive: ${error.toString()}`);
+      }
+    }
+  } catch (error) {
+    throw new Error(
+      `Unable to save metadata file for feed: ${error.toString()}`
+    );
+  }
+};
+
+export const writeItemMeta = ({
+  marker,
+  outputPath,
+  item,
+  archiveKeys,
+  archive,
+  override,
+}) => {
+  if (
+    archive &&
+    archiveKeys?.length &&
+    getIsInArchive({ archiveKeys, archive })
+  ) {
+    logMessage(`${marker} | Episode metadata exists in archive. Skipping...`);
+    return;
+  }
+
+  const output = getPublicObject(item);
+
+  try {
+    if (override || !fs.existsSync(outputPath)) {
+      fs.writeFileSync(outputPath, JSON.stringify(output, null, 4));
+    } else {
+      logMessage(`${marker} | Episode metadata exists locally. Skipping...`);
+    }
+
+    if (
+      archive &&
+      archiveKeys?.length &&
+      !getIsInArchive({ archiveKeys, archive })
+    ) {
+      try {
+        writeToArchive({ archiveKeys, archive });
+      } catch (error) {
+        throw new Error("Error writing to archive", error);
+      }
+    }
+  } catch (error) {
+    throw new Error("Unable to save meta file for episode", error);
+  }
+};

package/bin/naming.js

@@ -1,136 +1,144 @@
-import dayjs from "dayjs";
-import filenamify from "filenamify";
-import path from "path";
-
-const INVALID_CHAR_REPLACE = "_";
-
-const FILTER_FUNCTIONS = {
-  strip: (val) => val.replace(/\s+/g, ""),
-  strip_special: (val) => val.replace(/[^a-zA-Z0-9\s]/g, ""),
-  underscore: (val) => val.replace(/\s+/g, "_"),
-  dash: (val) => val.replace(/\s+/g, "-"),
-  camelcase: (val) =>
-    val
-      .split(/\s+/)
-      .map((w) =>
-        w ? w.charAt(0).toUpperCase() + w.slice(1).toLowerCase() : ""
-      )
-      .join(""),
-  lowercase: (val) => val.toLowerCase(),
-  uppercase: (val) => val.toUpperCase(),
-  trim: (val) => val.trim(),
-};
-
-const applyFilters = (value, filterStr) => {
-  if (!filterStr) {
-    return value;
-  }
-
-  const filters = filterStr.slice(1).split("|");
-  return filters.reduce((val, filter) => {
-    const filterFn = FILTER_FUNCTIONS[filter];
-    return filterFn ? filterFn(val) : val;
-  }, value);
-};
-
-const MAX_LENGTH_FILENAME = process.env.MAX_LENGTH_FILENAME
-  ? parseInt(process.env.MAX_LENGTH_FILENAME)
-  : 255;
-
-export const getSafeName = (name, maxLength = MAX_LENGTH_FILENAME) => {
-  return filenamify(name, {
-    replacement: INVALID_CHAR_REPLACE,
-    maxLength,
-  });
-};
-
-export const getSimpleFilename = (name, ext = "") => {
-  return `${getSafeName(name, MAX_LENGTH_FILENAME - (ext?.length ?? 0))}${ext}`;
-};
-
-export const getItemFilename = ({
-  item,
-  ext,
-  url,
-  feed,
-  template,
-  width,
-  customTemplateOptions = [],
-  offset = 0,
-}) => {
-  const episodeNum = feed.items.length - item._originalIndex + offset;
-  const title = item.title || "";
-
-  const releaseYear = item.pubDate
-    ? dayjs(new Date(item.pubDate)).format("YYYY")
-    : null;
-
-  const releaseMonth = item.pubDate
-    ? dayjs(new Date(item.pubDate)).format("MM")
-    : null;
-
-  const releaseDay = item.pubDate
-    ? dayjs(new Date(item.pubDate)).format("DD")
-    : null;
-
-  const releaseDate = item.pubDate
-    ? dayjs(new Date(item.pubDate)).format("YYYYMMDD")
-    : null;
-
-  const customReplacementTuples = customTemplateOptions.map((option, i) => {
-    const matchRegex = new RegExp(option);
-    const match = title.match(matchRegex);
-
-    return match && match[0] ? [`custom_${i}`, match[0]] : [`custom_${i}`, ""];
-  });
-
-  const templateReplacementsTuples = [
-    ["title", title],
-    ["release_date", releaseDate || ""],
-    ["release_year", releaseYear || ""],
-    ["release_month", releaseMonth || ""],
-    ["release_day", releaseDay || ""],
-    ["episode_num", `${episodeNum}`.padStart(width, "0")],
-    ["url", url],
-    ["podcast_title", feed.title || ""],
-    ["podcast_link", feed.link || ""],
-    ["duration", item.itunes?.duration || ""],
-    ["guid", item.guid],
-    ...customReplacementTuples,
-  ];
-
-  const replacementsMap = Object.fromEntries(templateReplacementsTuples);
-  const templateSegments = template.trim().split(path.sep);
-  const nameSegments = templateSegments.map((segment) => {
-    const replaceRegex = /{{(\w+)(\|[^}]+)?}}/g;
-    const name = segment.replace(replaceRegex, (match, varName, filterStr) => {
-      const replacement = replacementsMap[varName] || "";
-      return applyFilters(replacement, filterStr);
-    });
-
-    return getSimpleFilename(name);
-  });
-
-  nameSegments[nameSegments.length - 1] = getSimpleFilename(
-    nameSegments[nameSegments.length - 1],
-    ext
-  );
-
-  return nameSegments.join(path.sep);
-};
-
-export const getFolderName = ({ feed, template }) => {
-  const replacementsMap = {
-    podcast_title: feed.title || "",
-    podcast_link: feed.link || "",
-  };
-
-  const replaceRegex = /{{(\w+)(\|[^}]+)?}}/g;
-  const name = template.replace(replaceRegex, (_, varName, filterStr) => {
-    const replacement = replacementsMap[varName] || "";
-    const filtered = applyFilters(replacement, filterStr);
-    return getSafeName(filtered);
-  });
-
-  return name;
-};
+import dayjs from "dayjs";
+import filenamify from "filenamify";
+import path from "path";
+
+const INVALID_CHAR_REPLACE = "_";
+
+const FILTER_FUNCTIONS = {
+  strip: (val) => val.replace(/\s+/g, ""),
+  strip_special: (val) => val.replace(/[^a-zA-Z0-9\s]/g, ""),
+  underscore: (val) => val.replace(/\s+/g, "_"),
+  dash: (val) => val.replace(/\s+/g, "-"),
+  camelcase: (val) =>
+    val
+      .split(/\s+/)
+      .map((w) =>
+        w ? w.charAt(0).toUpperCase() + w.slice(1).toLowerCase() : ""
+      )
+      .join(""),
+  lowercase: (val) => val.toLowerCase(),
+  uppercase: (val) => val.toUpperCase(),
+  trim: (val) => val.trim(),
+};
+
+const applyFilters = (value, filterStr) => {
+  if (!filterStr) {
+    return value;
+  }
+
+  const filters = filterStr.slice(1).split("|");
+  return filters.reduce((val, filter) => {
+    const filterFn = FILTER_FUNCTIONS[filter];
+    return filterFn ? filterFn(val) : val;
+  }, value);
+};
+
+const MAX_LENGTH_FILENAME = process.env.MAX_LENGTH_FILENAME
+  ? parseInt(process.env.MAX_LENGTH_FILENAME)
+  : 255;
+
+export const getSafeName = (name, maxLength = MAX_LENGTH_FILENAME) => {
+  // Replace periods with underscores BEFORE filenamify truncation.
+  // filenamify treats periods as extension delimiters and preserves content
+  // after the last period while truncating from the START, which destroys
+  // dates and other important prefix content in podcast titles.
+  const sanitized = name.replace(/\./g, INVALID_CHAR_REPLACE);
+  return filenamify(sanitized, {
+    replacement: INVALID_CHAR_REPLACE,
+    maxLength,
+  });
+};
+
+export const getSimpleFilename = (name, ext = "") => {
+  return `${getSafeName(name, MAX_LENGTH_FILENAME - (ext?.length ?? 0))}${ext}`;
+};
+
+export const getItemFilename = ({
+  item,
+  ext,
+  url,
+  feed,
+  template,
+  width,
+  customTemplateOptions = [],
+  offset = 0,
+}) => {
+  const episodeNum = feed.items.length - item._originalIndex + offset;
+  const title = item.title || "";
+
+  const releaseYear = item.pubDate
+    ? dayjs(new Date(item.pubDate)).format("YYYY")
+    : null;
+
+  const releaseMonth = item.pubDate
+    ? dayjs(new Date(item.pubDate)).format("MM")
+    : null;
+
+  const releaseDay = item.pubDate
+    ? dayjs(new Date(item.pubDate)).format("DD")
+    : null;
+
+  const releaseDate = item.pubDate
+    ? dayjs(new Date(item.pubDate)).format("YYYYMMDD")
+    : null;
+
+  const customReplacementTuples = customTemplateOptions.map((option, i) => {
+    const matchRegex = new RegExp(option);
+    const match = title.match(matchRegex);
+
+    return match && match[0] ? [`custom_${i}`, match[0]] : [`custom_${i}`, ""];
+  });
+
+  const templateReplacementsTuples = [
+    ["title", title],
+    ["release_date", releaseDate || ""],
+    ["release_year", releaseYear || ""],
+    ["release_month", releaseMonth || ""],
+    ["release_day", releaseDay || ""],
+    ["episode_num", `${episodeNum}`.padStart(width, "0")],
+    ["url", url],
+    ["podcast_title", feed.title || ""],
+    ["podcast_link", feed.link || ""],
+    ["duration", item.itunes?.duration || ""],
+    ["guid", item.guid],
+    ...customReplacementTuples,
+  ];
+
+  const replacementsMap = Object.fromEntries(templateReplacementsTuples);
+  const templateSegments = template.trim().split(path.sep);
+  const nameSegments = templateSegments.map((segment, index) => {
+    const replaceRegex = /{{(\w+)(\|[^}]+)?}}/g;
+    const name = segment.replace(replaceRegex, (match, varName, filterStr) => {
+      const replacement = replacementsMap[varName] || "";
+      return applyFilters(replacement, filterStr);
+    });
+
+    // Only truncate non-final segments here (they don't get an extension)
+    // Final segment is truncated below with the extension accounted for
+    const isLastSegment = index === templateSegments.length - 1;
+    return isLastSegment ? name : getSimpleFilename(name);
+  });
+
+  nameSegments[nameSegments.length - 1] = getSimpleFilename(
+    nameSegments[nameSegments.length - 1],
+    ext
+  );
+
+  return nameSegments.join(path.sep);
+};
+
+export const getFolderName = ({ feed, template }) => {
+  const replacementsMap = {
+    podcast_title: feed.title || "",
+    podcast_link: feed.link || "",
+  };
+
+  const replaceRegex = /{{(\w+)(\|[^}]+)?}}/g;
+  const name = template.replace(replaceRegex, (_, varName, filterStr) => {
+    const replacement = replacementsMap[varName] || "";
+    const filtered = applyFilters(replacement, filterStr);
+    return getSafeName(filtered);
+  });
+
+  return name;
+};

package/bin/util.js

@@ -242,7 +242,6 @@ const getMimeCategory = (mime) => {
 
 export const correctExtensionFromMime = ({
   outputPath,
-  key,
   contentType,
   onCorrect,
 }) => {
@@ -250,32 +249,28 @@ export const correctExtensionFromMime = ({
   const mimeExt = mimeType ? getExtFromMime(mimeType) : null;
 
   if (!mimeExt) {
-    return { outputPath, key };
+    return outputPath;
   }
 
   const currentExt = path.extname(outputPath);
   if (mimeExt === currentExt) {
-    return { outputPath, key };
+    return outputPath;
   }
 
   const currentCategory = getExtCategory(currentExt);
   const mimeCategory = getMimeCategory(mimeType);
 
   if (currentCategory && mimeCategory && currentCategory !== mimeCategory) {
-    return { outputPath, key };
+    return outputPath;
   }
 
   const basePath = currentExt
     ? outputPath.slice(0, -currentExt.length)
     : outputPath;
-  const baseKey = key && currentExt ? key.slice(0, -currentExt.length) : key;
 
   onCorrect?.(currentExt || "(none)", mimeExt);
 
-  return {
-    outputPath: basePath + mimeExt,
-    key: baseKey ? baseKey + mimeExt : null,
-  };
+  return basePath + mimeExt;
 };
 
 export const VALID_AUDIO_EXTS = [

package/package.json

@@ -1,65 +1,65 @@
-{
-  "name": "podcast-dl",
-  "version": "11.6.1",
-  "description": "A CLI for downloading podcasts.",
-  "type": "module",
-  "bin": "./bin/bin.js",
-  "scripts": {
-    "build": "rimraf ./binaries && rimraf ./dist && node build.cjs",
-    "lint": "eslint ./bin"
-  },
-  "lint-staged": {
-    "*.{js,json,md}": [
-      "prettier --write"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged",
-      "pre-push": "npm run lint"
-    }
-  },
-  "keywords": [
-    "podcast",
-    "podcasts",
-    "downloader",
-    "cli"
-  ],
-  "engines": {
-    "node": ">=18.17.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/lightpohl/podcast-dl.git"
-  },
-  "files": [
-    "bin",
-    "lib"
-  ],
-  "author": "Joshua Pohl",
-  "license": "MIT",
-  "devDependencies": {
-    "@eslint/js": "^9.18.0",
-    "@yao-pkg/pkg": "^6.6.0",
-    "eslint": "^9.18.0",
-    "globals": "^15.14.0",
-    "husky": "^4.2.5",
-    "lint-staged": "^10.1.7",
-    "prettier": "2.3.2",
-    "rimraf": "^3.0.2",
-    "webpack": "^5.75.0"
-  },
-  "dependencies": {
-    "command-exists": "^1.2.9",
-    "commander": "^12.1.0",
-    "dayjs": "^1.8.25",
-    "filenamify": "^6.0.0",
-    "global-agent": "^3.0.0",
-    "got": "^11.0.2",
-    "p-limit": "^4.0.0",
-    "pluralize": "^8.0.0",
-    "entities": "^2.0.3",
-    "xml2js": "^0.5.0",
-    "throttle-debounce": "^3.0.1"
-  }
-}
+{
+  "name": "podcast-dl",
+  "version": "11.7.1",
+  "description": "A CLI for downloading podcasts.",
+  "type": "module",
+  "bin": "./bin/bin.js",
+  "scripts": {
+    "build": "rimraf ./binaries && rimraf ./dist && node build.cjs",
+    "lint": "eslint ./bin"
+  },
+  "lint-staged": {
+    "*.{js,json,md}": [
+      "prettier --write"
+    ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "npm run lint"
+    }
+  },
+  "keywords": [
+    "podcast",
+    "podcasts",
+    "downloader",
+    "cli"
+  ],
+  "engines": {
+    "node": ">=18.17.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lightpohl/podcast-dl.git"
+  },
+  "files": [
+    "bin",
+    "lib"
+  ],
+  "author": "Joshua Pohl",
+  "license": "MIT",
+  "devDependencies": {
+    "@eslint/js": "^9.18.0",
+    "@yao-pkg/pkg": "^6.6.0",
+    "eslint": "^9.18.0",
+    "globals": "^15.14.0",
+    "husky": "^4.2.5",
+    "lint-staged": "^10.1.7",
+    "prettier": "2.3.2",
+    "rimraf": "^3.0.2",
+    "webpack": "^5.75.0"
+  },
+  "dependencies": {
+    "command-exists": "^1.2.9",
+    "commander": "^12.1.0",
+    "dayjs": "^1.8.25",
+    "filenamify": "^6.0.0",
+    "global-agent": "^3.0.0",
+    "got": "^11.0.2",
+    "p-limit": "^4.0.0",
+    "pluralize": "^8.0.0",
+    "entities": "^2.0.3",
+    "xml2js": "^0.5.0",
+    "throttle-debounce": "^3.0.1"
+  }
+}