Merge remote-tracking branch 'origin/master'

Author: chhoumann

src/downloadEpisode.ts

@@ -5,6 +5,7 @@ import type { Episode } from "./types/Episode";
 import type { LocalEpisode } from "./types/LocalEpisode";
 import { isLocalFile } from "./utility/isLocalFile";
 import getUrlExtension from "./utility/getUrlExtension";
+import getExtensionFromContentType from "./utility/getExtensionFromContentType";
 
 function getErrorMessage(error: unknown): string {
 	return error instanceof Error ? error.message : String(error);
@@ -76,18 +77,11 @@ export default async function downloadEpisodeWithNotice(
 		},
 	});
 
-	const fileExtension = await detectAudioFileExtension(blob);
-	if (!fileExtension) {
-		update((bodyEl) => {
-			bodyEl.createEl("p", {
-				text: `Could not determine file extension for downloaded file. Blob: ${blob.size} bytes.`,
-			});
-		});
+	const inferredExtension = await inferFileExtensionFromDownload(episode, blob);
+	const normalizedType = (blob.type ?? "").toLowerCase();
+	const typeAppearsAudio = normalizedType === "" || normalizedType.includes("audio");
 
-		throw new Error("Could not determine file extension");
-	}
-
-	if (!blob.type.contains("audio") && !fileExtension) {
+	if (!typeAppearsAudio && !inferredExtension) {
 		update((bodyEl) => {
 			bodyEl.createEl("p", {
 				text: `Downloaded file is not an audio file. It is of type "${blob.type}". Blob: ${blob.size} bytes.`,
@@ -97,6 +91,8 @@ export default async function downloadEpisodeWithNotice(
 		throw new Error("Not an audio file");
 	}
 
+	const fileExtension = inferredExtension ?? "mp3";
+
 	try {
 		update((bodyEl) => bodyEl.createEl("p", { text: "Creating file..." }));
 
@@ -231,6 +227,23 @@ function getLocalFilePathFromLink(link: string): string | null {
 	return null;
 }
 
+async function inferFileExtensionFromDownload(
+	episode: Episode,
+	blob: Blob,
+): Promise<string | null> {
+	const signatureExtension = await detectAudioFileExtension(blob);
+	if (signatureExtension) {
+		return signatureExtension;
+	}
+
+	const urlExtension = getUrlExtension(episode.streamUrl);
+	if (urlExtension) {
+		return urlExtension;
+	}
+
+	return getExtensionFromContentType(blob.type);
+}
+
 export async function downloadEpisode(
 	episode: Episode,
 	downloadPathTemplate: string,
@@ -286,11 +299,10 @@ async function getFileExtension(url: string): Promise<string> {
 	const response = await fetch(url, { method: "HEAD" });
 	const contentType = response.headers.get("content-type");
 
-	if (contentType?.includes("audio/mpeg")) return "mp3";
-	if (contentType?.includes("audio/mp4")) return "m4a";
-	if (contentType?.includes("audio/ogg")) return "ogg";
-	if (contentType?.includes("audio/wav")) return "wav";
-	if (contentType?.includes("audio/x-m4a")) return "m4a";
+	const extensionFromContentType = getExtensionFromContentType(contentType);
+	if (extensionFromContentType) {
+		return extensionFromContentType;
+	}
 
 	// Default to mp3 if we can't determine the type
 	return "mp3";

src/utility/getExtensionFromContentType.test.ts

@@ -0,0 +1,16 @@
+import { describe, expect, test } from "vitest";
+import getExtensionFromContentType from "./getExtensionFromContentType";
+
+describe("getExtensionFromContentType", () => {
+	test("detects mp3 from standard mime type", () => {
+		expect(getExtensionFromContentType("audio/mpeg")).toBe("mp3");
+	});
+
+	test("handles mixed case mime types", () => {
+		expect(getExtensionFromContentType("Audio/X-M4A")).toBe("m4a");
+	});
+
+	test("returns null when mime type is not audio", () => {
+		expect(getExtensionFromContentType("text/html")).toBeNull();
+	});
+});

src/utility/getExtensionFromContentType.ts

@@ -0,0 +1,34 @@
+const CONTENT_TYPE_EXTENSION_MAP: Array<{
+	pattern: RegExp;
+	extension: string;
+}> = [
+	{ pattern: /audio\/mpeg/i, extension: "mp3" },
+	{ pattern: /audio\/mp3/i, extension: "mp3" },
+	{ pattern: /audio\/mp4/i, extension: "m4a" },
+	{ pattern: /audio\/x-m4a/i, extension: "m4a" },
+	{ pattern: /audio\/aac/i, extension: "aac" },
+	{ pattern: /audio\/ogg/i, extension: "ogg" },
+	{ pattern: /audio\/wav/i, extension: "wav" },
+	{ pattern: /audio\/x-wav/i, extension: "wav" },
+	{ pattern: /audio\/flac/i, extension: "flac" },
+	{ pattern: /audio\/x-flac/i, extension: "flac" },
+	{ pattern: /audio\/x-ms-wma/i, extension: "wma" },
+	{ pattern: /audio\/wma/i, extension: "wma" },
+	{ pattern: /audio\/amr/i, extension: "amr" },
+];
+
+export default function getExtensionFromContentType(
+	contentType?: string | null,
+): string | null {
+	if (!contentType) {
+		return null;
+	}
+
+	for (const { pattern, extension } of CONTENT_TYPE_EXTENSION_MAP) {
+		if (pattern.test(contentType)) {
+			return extension;
+		}
+	}
+
+	return null;
+}