podcast-dl 9.1.0 → 9.2.1

package/bin/logger.js

@@ -1,92 +1,92 @@
-const ERROR_STATUSES = {
-  general: 1,
-  nothingDownloaded: 2,
-  completedWithErrors: 3,
-};
-
-const LOG_LEVEL_TYPES = {
-  debug: "debug",
-  quiet: "quiet",
-  silent: "silent",
-  static: "static",
-};
-
-const LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  important: 2,
-};
-
-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
-  );
-};
-
-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;
-  }
-};
-
-const getLogMessageWithMarker = (marker) => {
-  return (message, logLevel) => {
-    if (marker) {
-      logMessage(`${marker} | ${message}`, logLevel);
-    } else {
-      logMessage(message, logLevel);
-    }
-  };
-};
-
-const logError = (msg, error) => {
-  if (process.env.LOG_LEVEL === LOG_LEVEL_TYPES.silent) {
-    return;
-  }
-
-  console.error(msg);
-
-  if (error) {
-    console.error(error.message);
-  }
-};
-
-const logErrorAndExit = (msg, error) => {
-  console.error(msg);
-
-  if (error) {
-    console.error(error.message);
-  }
-
-  process.exit(ERROR_STATUSES.general);
-};
-
-export {
-  ERROR_STATUSES,
-  getShouldOutputProgressIndicator,
-  getLogMessageWithMarker,
-  LOG_LEVELS,
-  logMessage,
-  logError,
-  logErrorAndExit,
-};
+const ERROR_STATUSES = {
+  general: 1,
+  nothingDownloaded: 2,
+  completedWithErrors: 3,
+};
+
+const LOG_LEVEL_TYPES = {
+  debug: "debug",
+  quiet: "quiet",
+  silent: "silent",
+  static: "static",
+};
+
+const LOG_LEVELS = {
+  debug: 0,
+  info: 1,
+  important: 2,
+};
+
+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
+  );
+};
+
+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;
+  }
+};
+
+const getLogMessageWithMarker = (marker) => {
+  return (message, logLevel) => {
+    if (marker) {
+      logMessage(`${marker} | ${message}`, logLevel);
+    } else {
+      logMessage(message, logLevel);
+    }
+  };
+};
+
+const logError = (msg, error) => {
+  if (process.env.LOG_LEVEL === LOG_LEVEL_TYPES.silent) {
+    return;
+  }
+
+  console.error(msg);
+
+  if (error) {
+    console.error(error.message);
+  }
+};
+
+const logErrorAndExit = (msg, error) => {
+  console.error(msg);
+
+  if (error) {
+    console.error(error.message);
+  }
+
+  process.exit(ERROR_STATUSES.general);
+};
+
+export {
+  ERROR_STATUSES,
+  getShouldOutputProgressIndicator,
+  getLogMessageWithMarker,
+  LOG_LEVELS,
+  logMessage,
+  logError,
+  logErrorAndExit,
+};

package/bin/naming.js

@@ -1,85 +1,96 @@
-import filenamify from "filenamify";
-import dayjs from "dayjs";
-
-const INVALID_CHAR_REPLACE = "_";
-const MAX_LENGTH_FILENAME = process.env.MAX_LENGTH_FILENAME
-  ? parseInt(process.env.MAX_LENGTH_FILENAME)
-  : 255;
-
-const getSafeName = (name, maxLength = MAX_LENGTH_FILENAME) => {
-  return filenamify(name, {
-    replacement: INVALID_CHAR_REPLACE,
-    maxLength,
-  });
-};
-
-const getSimpleFilename = (name, ext = "") => {
-  return `${getSafeName(name, MAX_LENGTH_FILENAME - (ext?.length ?? 0))}${ext}`;
-};
-
-const getItemFilename = ({ item, ext, url, feed, template, width }) => {
-  const episodeNum = feed.items.length - item._originalIndex;
-  const formattedPubDate = item.pubDate
-    ? dayjs(new Date(item.pubDate)).format("YYYYMMDD")
-    : null;
-
-  const templateReplacementsTuples = [
-    ["title", item.title || ""],
-    ["release_date", formattedPubDate || ""],
-    ["episode_num", `${episodeNum}`.padStart(width, "0")],
-    ["url", url],
-    ["podcast_title", feed.title || ""],
-    ["podcast_link", feed.link || ""],
-    ["duration", item.itunes?.duration || ""],
-    ["guid", item.guid],
-  ];
-
-  let name = template;
-  templateReplacementsTuples.forEach((replacementTuple) => {
-    const [matcher, replacement] = replacementTuple;
-    const replaceRegex = new RegExp(`{{${matcher}}}`, "g");
-
-    name = replacement
-      ? name.replace(replaceRegex, replacement)
-      : name.replace(replaceRegex, "");
-  });
-
-  return getSimpleFilename(name, ext);
-};
-
-const getFolderName = ({ feed, template }) => {
-  const templateReplacementsTuples = [
-    ["podcast_title", feed.title || ""],
-    ["podcast_link", feed.link || ""],
-  ];
-
-  let name = template;
-  templateReplacementsTuples.forEach((replacementTuple) => {
-    const [matcher, replacement] = replacementTuple;
-    const replaceRegex = new RegExp(`{{${matcher}}}`, "g");
-
-    name = replacement
-      ? name.replace(replaceRegex, getSafeName(replacement))
-      : name.replace(replaceRegex, "");
-  });
-
-  return name;
-};
-
-const getArchiveFilename = ({ pubDate, name, ext }) => {
-  const formattedPubDate = pubDate
-    ? dayjs(new Date(pubDate)).format("YYYYMMDD")
-    : null;
-
-  const baseName = formattedPubDate ? `${formattedPubDate}-${name}` : name;
-
-  return `${baseName}${ext}`;
-};
-
-export {
-  getArchiveFilename,
-  getFolderName,
-  getItemFilename,
-  getSafeName,
-  getSimpleFilename,
-};
+import path from "path";
+import filenamify from "filenamify";
+import dayjs from "dayjs";
+
+const INVALID_CHAR_REPLACE = "_";
+const MAX_LENGTH_FILENAME = process.env.MAX_LENGTH_FILENAME
+  ? parseInt(process.env.MAX_LENGTH_FILENAME)
+  : 255;
+
+const getSafeName = (name, maxLength = MAX_LENGTH_FILENAME) => {
+  return filenamify(name, {
+    replacement: INVALID_CHAR_REPLACE,
+    maxLength,
+  });
+};
+
+const getSimpleFilename = (name, ext = "") => {
+  return `${getSafeName(name, MAX_LENGTH_FILENAME - (ext?.length ?? 0))}${ext}`;
+};
+
+const getItemFilename = ({ item, ext, url, feed, template, width }) => {
+  const episodeNum = feed.items.length - item._originalIndex;
+  const formattedPubDate = item.pubDate
+    ? dayjs(new Date(item.pubDate)).format("YYYYMMDD")
+    : null;
+
+  const templateReplacementsTuples = [
+    ["title", item.title || ""],
+    ["release_date", formattedPubDate || ""],
+    ["episode_num", `${episodeNum}`.padStart(width, "0")],
+    ["url", url],
+    ["podcast_title", feed.title || ""],
+    ["podcast_link", feed.link || ""],
+    ["duration", item.itunes?.duration || ""],
+    ["guid", item.guid],
+  ];
+
+  const templateSegments = template.trim().split(path.sep);
+  const nameSegments = templateSegments.map((segment) => {
+    let name = segment;
+    templateReplacementsTuples.forEach((replacementTuple) => {
+      const [matcher, replacement] = replacementTuple;
+      const replaceRegex = new RegExp(`{{${matcher}}}`, "g");
+
+      name = replacement
+        ? name.replace(replaceRegex, replacement)
+        : name.replace(replaceRegex, "");
+    });
+
+    return getSimpleFilename(name);
+  });
+
+  nameSegments[nameSegments.length - 1] = getSimpleFilename(
+    nameSegments[nameSegments.length - 1],
+    ext
+  );
+
+  return nameSegments.join(path.sep);
+};
+
+const getFolderName = ({ feed, template }) => {
+  const templateReplacementsTuples = [
+    ["podcast_title", feed.title || ""],
+    ["podcast_link", feed.link || ""],
+  ];
+
+  let name = template;
+  templateReplacementsTuples.forEach((replacementTuple) => {
+    const [matcher, replacement] = replacementTuple;
+    const replaceRegex = new RegExp(`{{${matcher}}}`, "g");
+
+    name = replacement
+      ? name.replace(replaceRegex, getSafeName(replacement))
+      : name.replace(replaceRegex, "");
+  });
+
+  return name;
+};
+
+const getArchiveFilename = ({ pubDate, name, ext }) => {
+  const formattedPubDate = pubDate
+    ? dayjs(new Date(pubDate)).format("YYYYMMDD")
+    : null;
+
+  const baseName = formattedPubDate ? `${formattedPubDate}-${name}` : name;
+
+  return `${baseName}${ext}`;
+};
+
+export {
+  getArchiveFilename,
+  getFolderName,
+  getItemFilename,
+  getSafeName,
+  getSimpleFilename,
+};