Merge remote-tracking branch 'origin/master'

Author: chhoumann

manifest.json

@@ -1,11 +1,11 @@
 {
 	"id": "podnotes",
 	"name": "PodNotes",
-	"version": "2.14.1",
+	"version": "2.14.2",
 	"minAppVersion": "0.15.9",
 	"description": "Helps you write notes on podcasts.",
 	"author": "Christian B. B. Houmann",
 	"authorUrl": "https://bagerbach.com",
 	"fundingUrl": "https://buymeacoffee.com/chhoumann",
 	"isDesktopOnly": false
-}
+}

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "podnotes",
-	"version": "2.14.1",
+	"version": "2.14.2",
 	"description": "Helps you write notes on podcasts.",
 	"main": "main.js",
 	"scripts": {

package.json

@@ -4,6 +4,7 @@ import { DownloadPathTemplateEngine } from "./TemplateEngine";
 import type { Episode } from "./types/Episode";
 import type { LocalEpisode } from "./types/LocalEpisode";
 import { isLocalFile } from "./utility/isLocalFile";
+import { encodeUrlForRequest } from "./utility/encodeUrlForRequest";
 import getUrlExtension from "./utility/getUrlExtension";
 import getExtensionFromContentType from "./utility/getExtensionFromContentType";
 
@@ -18,8 +19,9 @@ async function downloadFile(
 		onError: (error: Error) => void;
 	}>,
 ) {
+	const encodedUrl = encodeUrlForRequest(url);
 	try {
-		const response = await requestUrl({ url, method: "GET" });
+		const response = await requestUrl({ url: encodedUrl, method: "GET" });
 
 		if (response.status !== 200) {
 			throw new Error("Could not download episode.");
@@ -38,7 +40,7 @@ async function downloadFile(
 			}),
 			contentLength,
 			receivedLength: contentLength,
-			responseUrl: url,
+			responseUrl: encodedUrl,
 		};
 	} catch (error: unknown) {
 		const err = new Error(
@@ -292,16 +294,21 @@ export async function downloadEpisode(
 }
 
 async function getFileExtension(url: string): Promise<string> {
-	const urlExtension = getUrlExtension(url);
+	const encodedUrl = encodeUrlForRequest(url);
+	const urlExtension = getUrlExtension(encodedUrl);
 	if (urlExtension) return urlExtension;
 
 	// If URL doesn't have an extension, fetch headers to determine content type
-	const response = await fetch(url, { method: "HEAD" });
-	const contentType = response.headers.get("content-type");
+	try {
+		const response = await fetch(encodedUrl, { method: "HEAD" });
+		const contentType = response.headers.get("content-type");
 
-	const extensionFromContentType = getExtensionFromContentType(contentType);
-	if (extensionFromContentType) {
-		return extensionFromContentType;
+		const extensionFromContentType = getExtensionFromContentType(contentType);
+		if (extensionFromContentType) {
+			return extensionFromContentType;
+		}
+	} catch (error) {
+		console.error(`HEAD request failed for ${encodedUrl}`, error);
 	}
 
 	// Default to mp3 if we can't determine the type