podcast-dl 7.2.0 → 7.3.2

package/bin/async.js

@@ -22,6 +22,7 @@ import {
   writeItemMeta,
   writeToArchive,
   getUrlEmbed,
+  getIsInArchive,
 } from "./util.js";
 
 const pipeline = promisify(stream.pipeline);
@@ -44,6 +45,11 @@ const download = async ({
     return;
   }
 
+  if (key && archive && getIsInArchive({ key, archive })) {
+    logMessage("Download exists in archive. Skipping...");
+    return;
+  }
+
   let embeddedUrl = null;
   if (filterUrlTracking) {
     logMessage("Attempting to find embedded URL...");
@@ -125,14 +131,6 @@ const download = async ({
 
   fs.renameSync(tempOutputPath, outputPath);
 
-  if (expectedSize && !isNaN(expectedSize) && expectedSize !== fileSize) {
-    logMessage(
-      "File size differs from expected content length. Suggestion: verify file works as expected",
-      LOG_LEVELS.important
-    );
-    logMessage(`${outputPath}`, LOG_LEVELS.important);
-  }
-
   logMessage("Download complete!");
 
   if (onAfterDownload) {

package/bin/bin.js

@@ -293,6 +293,24 @@ const main = async () => {
     filterUrlTracking,
   });
 
+  if (hasErrors && numEpisodesDownloaded !== targetItems.length) {
+    logMessage(
+      `\n${numEpisodesDownloaded} of ${pluralize(
+        "episode",
+        targetItems.length,
+        true
+      )} downloaded\n`
+    );
+  } else if (numEpisodesDownloaded > 0) {
+    logMessage(
+      `\nSuccessfully downloaded ${pluralize(
+        "episode",
+        numEpisodesDownloaded,
+        true
+      )}\n`
+    );
+  }
+
   if (numEpisodesDownloaded === 0) {
     process.exit(ERROR_STATUSES.nothingDownloaded);
   }

package/bin/util.js

@@ -97,28 +97,28 @@ const getUrlEmbed = async (url) => {
   return null;
 };
 
-const getLoopControls = ({ limit, offset, length, reverse }) => {
+const getLoopControls = ({ offset, length, reverse }) => {
   if (reverse) {
     const startIndex = length - 1 - offset;
-    const min = limit ? Math.max(startIndex - limit, -1) : -1;
-    const limitCheck = (i) => i > min;
+    const min = -1;
+    const shouldGo = (i) => i > min;
     const decrement = (i) => i - 1;
 
     return {
       startIndex,
-      limitCheck,
+      shouldGo,
       next: decrement,
     };
   }
 
   const startIndex = 0 + offset;
-  const max = limit ? Math.min(startIndex + limit, length) : length;
-  const limitCheck = (i) => i < max;
+  const max = length;
+  const shouldGo = (i) => i < max;
   const increment = (i) => i + 1;
 
   return {
     startIndex,
-    limitCheck,
+    shouldGo,
     next: increment,
   };
 };
@@ -137,8 +137,7 @@ const getItemsToDownload = ({
   episodeTemplate,
   includeEpisodeImages,
 }) => {
-  const { startIndex, limitCheck, next } = getLoopControls({
-    limit,
+  const { startIndex, shouldGo, next } = getLoopControls({
     offset,
     reverse,
     length: feed.items.length,
@@ -149,7 +148,7 @@ const getItemsToDownload = ({
 
   const savedArchive = archive ? getArchive(archive) : [];
 
-  while (limitCheck(i)) {
+  while (shouldGo(i)) {
     const { title, pubDate } = feed.items[i];
     const pubDateDay = dayjs(new Date(pubDate));
     let isValid = true;
@@ -215,22 +214,20 @@ const getItemsToDownload = ({
             }),
           });
 
-          if (!savedArchive.includes(episodeImageArchiveKey)) {
-            const episodeImageName = getFilename({
-              item,
-              feed,
-              url: episodeAudioUrl,
-              ext: episodeImageFileExt,
-              template: episodeTemplate,
-            });
-
-            const outputImagePath = path.resolve(basePath, episodeImageName);
-            item._extra_downloads.push({
-              url: episodeImageUrl,
-              outputPath: outputImagePath,
-              key: episodeImageArchiveKey,
-            });
-          }
+          const episodeImageName = getFilename({
+            item,
+            feed,
+            url: episodeAudioUrl,
+            ext: episodeImageFileExt,
+            template: episodeTemplate,
+          });
+
+          const outputImagePath = path.resolve(basePath, episodeImageName);
+          item._extra_downloads.push({
+            url: episodeImageUrl,
+            outputPath: outputImagePath,
+            key: episodeImageArchiveKey,
+          });
         }
       }
 
@@ -240,7 +237,7 @@ const getItemsToDownload = ({
     i = next(i);
   }
 
-  return items;
+  return limit ? items.slice(0, limit) : items;
 };
 
 const logFeedInfo = (feed) => {
@@ -295,34 +292,24 @@ const logItemsList = ({
 
 const writeFeedMeta = ({ outputPath, feed, key, archive, override }) => {
   if (key && archive && getIsInArchive({ key, archive })) {
-    logMessage("Feed metadata exists in archive. Skipping write...");
+    logMessage("Feed metadata exists in archive. Skipping...");
     return;
   }
 
-  const title = feed.title || null;
-  const description = feed.description || null;
-  const link = feed.link || null;
-  const feedUrl = feed.feedUrl || null;
-  const managingEditor = feed.managingEditor || null;
+  const output = {};
+  ["title", "description", "link", "feedUrl", "managingEditor"].forEach(
+    (key) => {
+      if (feed[key]) {
+        output[key] = feed[key];
+      }
+    }
+  );
 
   try {
     if (override || !fs.existsSync(outputPath)) {
-      fs.writeFileSync(
-        outputPath,
-        JSON.stringify(
-          {
-            title,
-            description,
-            link,
-            feedUrl,
-            managingEditor,
-          },
-          null,
-          4
-        )
-      );
+      fs.writeFileSync(outputPath, JSON.stringify(output, null, 4));
     } else {
-      logMessage("Feed metadata exists locally. Skipping write...");
+      logMessage("Feed metadata exists locally. Skipping...");
     }
 
     if (key && archive && !getIsInArchive({ key, archive })) {
@@ -348,36 +335,22 @@ const writeItemMeta = ({
   override,
 }) => {
   if (key && archive && getIsInArchive({ key, archive })) {
-    logMessage(
-      `${marker} | Episode metadata exists in archive. Skipping write...`
-    );
+    logMessage(`${marker} | Episode metadata exists in archive. Skipping...`);
     return;
   }
 
-  const title = item.title || null;
-  const descriptionText = item.contentSnippet || null;
-  const pubDate = item.pubDate || null;
-  const creator = item.creator || null;
+  const output = {};
+  ["title", "contentSnippet", "pubDate", "creator"].forEach((key) => {
+    if (item[key]) {
+      output[key] = item[key];
+    }
+  });
 
   try {
     if (override || !fs.existsSync(outputPath)) {
-      fs.writeFileSync(
-        outputPath,
-        JSON.stringify(
-          {
-            title,
-            pubDate,
-            creator,
-            descriptionText,
-          },
-          null,
-          4
-        )
-      );
+      fs.writeFileSync(outputPath, JSON.stringify(output, null, 4));
     } else {
-      logMessage(
-        `${marker} | Episode metadata exists locally. Skipping write...`
-      );
+      logMessage(`${marker} | Episode metadata exists locally. Skipping...`);
     }
 
     if (key && archive && !getIsInArchive({ key, archive })) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podcast-dl",
-  "version": "7.2.0",
+  "version": "7.3.2",
   "description": "A CLI for downloading podcasts.",
   "type": "module",
   "bin": "./bin/bin.js",