podcast-dl 11.6.2 → 11.7.1

package/bin/archive.js

@@ -7,25 +7,37 @@ 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, archive }) => {
+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))
+  );
 
-  if (!archiveResult.includes(key)) {
-    archiveResult.push(key);
-  }
+  keys.forEach((archiveKey) => {
+    if (!archiveResult.includes(archiveKey)) {
+      archiveResult.push(archiveKey);
+    }
+  });
 
   fs.writeFileSync(archivePath, JSON.stringify(archiveResult, null, 4));
 };
 
-export const getIsInArchive = ({ key, archive }) => {
+export const getIsInArchive = ({ key, archiveKeys, archive }) => {
   const archiveResult = getArchive(archive);
-  return archiveResult.includes(key);
+  const keys = [key, ...(archiveKeys || [])].filter(Boolean);
+  return keys.some((archiveKey) => archiveResult.includes(archiveKey));
 };
 
 export const getArchiveFilename = ({ pubDate, name, 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/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/meta.js

@@ -35,11 +35,15 @@ export const writeItemMeta = ({
   marker,
   outputPath,
   item,
-  key,
+  archiveKeys,
   archive,
   override,
 }) => {
-  if (key && archive && getIsInArchive({ key, archive })) {
+  if (
+    archive &&
+    archiveKeys?.length &&
+    getIsInArchive({ archiveKeys, archive })
+  ) {
     logMessage(`${marker} | Episode metadata exists in archive. Skipping...`);
     return;
   }
@@ -53,9 +57,13 @@ export const writeItemMeta = ({
       logMessage(`${marker} | Episode metadata exists locally. Skipping...`);
     }
 
-    if (key && archive && !getIsInArchive({ key, archive })) {
+    if (
+      archive &&
+      archiveKeys?.length &&
+      !getIsInArchive({ archiveKeys, archive })
+    ) {
       try {
-        writeToArchive({ key, archive });
+        writeToArchive({ archiveKeys, archive });
       } catch (error) {
         throw new Error("Error writing to archive", error);
       }

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,6 +1,6 @@
 {
   "name": "podcast-dl",
-  "version": "11.6.2",
+  "version": "11.7.1",
   "description": "A CLI for downloading podcasts.",
   "type": "module",
   "bin": "./bin/bin.js",