fix: handle file feeds with missing 'feedUrl'

fixes #87
lightpohl · Nov 1, 2024 · 1e6b89a · 1e6b89a
1 parent 5d12ebe
commit 1e6b89a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/bin/async.js b/bin/async.js
@@ -159,7 +159,7 @@ const download = async (options) => {
 const downloadItemsAsync = async ({
   addMp3MetadataFlag,
   archive,
-  archiveUrl,
+  archivePrefix,
   attempts,
   basePath,
   bitrate,
@@ -215,7 +215,7 @@ const downloadItemsAsync = async ({
         alwaysPostprocess,
         marker,
         key: getArchiveKey({
-          prefix: archiveUrl,
+          prefix: archivePrefix,
           name: getArchiveFilename({
             name: item.title,
             pubDate: item.pubDate,
@@ -300,7 +300,7 @@ const downloadItemsAsync = async ({
           override,
           item,
           key: getArchiveKey({
-            prefix: archiveUrl,
+            prefix: archivePrefix,
             name: getArchiveFilename({
               pubDate: item.pubDate,
               name: item.title,

diff --git a/bin/bin.js b/bin/bin.js
@@ -84,8 +84,15 @@ const main = async () => {
     ? await getUrlFeed(url, parserConfig)
     : await getFileFeed(file, parserConfig);
 
-  const { hostname, pathname } = new URL(feed.feedUrl || url);
-  const archiveUrl = `${hostname}${pathname}`;
+  const archivePrefix = (() => {
+    if (feed.feedUrl || url) {
+      const { hostname, pathname } = new URL(feed.feedUrl || url);
+      return `${hostname}${pathname}`;
+    }
+
+    return feed.title || file;
+  })();
+
   const basePath = _path.resolve(
     process.cwd(),
     getFolderName({ feed, template: outDir })
@@ -152,7 +159,7 @@ const main = async () => {
           override,
           marker: podcastImageUrl,
           key: getArchiveKey({
-            prefix: archiveUrl,
+            prefix: archivePrefix,
             name: `${
               feed.title ? `${feed.title}.image` : "image"
             }${podcastImageFileExt}`,
@@ -181,7 +188,7 @@ const main = async () => {
         override,
         feed,
         key: getArchiveKey({
-          prefix: archiveUrl,
+          prefix: archivePrefix,
           name: `${feed.title ? `${feed.title}.meta` : "meta"}.json`,
         }),
         outputPath: outputMetaPath,
@@ -201,7 +208,7 @@ const main = async () => {
 
   const targetItems = getItemsToDownload({
     archive,
-    archiveUrl,
+    archivePrefix,
     basePath,
     feed,
     limit,
@@ -231,7 +238,7 @@ const main = async () => {
   const { numEpisodesDownloaded, hasErrors } = await downloadItemsAsync({
     addMp3MetadataFlag,
     archive,
-    archiveUrl,
+    archivePrefix,
     attempts,
     basePath,
     bitrate,

diff --git a/bin/util.js b/bin/util.js
@@ -152,7 +152,7 @@ const getLoopControls = ({ offset, length, reverse }) => {
 
 const getItemsToDownload = ({
   archive,
-  archiveUrl,
+  archivePrefix,
   basePath,
   feed,
   limit,
@@ -216,7 +216,7 @@ const getItemsToDownload = ({
     const { url: episodeAudioUrl, ext: audioFileExt } =
       getEpisodeAudioUrlAndExt(feed.items[i], episodeSourceOrder);
     const key = getArchiveKey({
-      prefix: archiveUrl,
+      prefix: archivePrefix,
       name: getArchiveFilename({
         pubDate,
         name: title,
@@ -239,7 +239,7 @@ const getItemsToDownload = ({
         if (episodeImageUrl) {
           const episodeImageFileExt = getUrlExt(episodeImageUrl);
           const episodeImageArchiveKey = getArchiveKey({
-            prefix: archiveUrl,
+            prefix: archivePrefix,
             name: getArchiveFilename({
               pubDate,
               name: title,
@@ -276,7 +276,7 @@ const getItemsToDownload = ({
         if (episodeTranscriptUrl) {
           const episodeTranscriptFileExt = getUrlExt(episodeTranscriptUrl);
           const episodeTranscriptArchiveKey = getArchiveKey({
-            prefix: archiveUrl,
+            prefix: archivePrefix,
             name: getArchiveFilename({
               pubDate,
               name: title,