From 283cb7155c80f61fe4f5a8bb3c9246c0fbba2997 Mon Sep 17 00:00:00 2001
From: Andrew <66430340+aandrew-me@users.noreply.github.com>
Date: Sat, 5 Aug 2023 20:10:27 +0300
Subject: [PATCH] Download original audio for m4a in playlists

---
 html/index.html |   2 +-
 package.json    |   2 +-
 src/playlist.js | 104 ++++++++++++++++++++++++++++++++----------------
 src/renderer.js |   8 ++--
 4 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/html/index.html b/html/index.html
index a52b69b..395aeba 100644
--- a/html/index.html
+++ b/html/index.html
@@ -46,7 +46,7 @@
     <!-- Menu -->
     <div id="menu">
         <a id="playlistWin" class="menuItem">Download Playlist</a>
-        <a id="newPlaylistWin" class="menuItem">New Playlist</a>
+        <!-- <a id="newPlaylistWin" class="menuItem">New Playlist</a> -->
         <a id="preferenceWin" class="menuItem">Preferences</a>
         <a id="aboutWin" class="menuItem">About</a>
         <span id="themeTxt" class="menuItem">Theme:</span>
diff --git a/package.json b/package.json
index ab75dd7..33975de 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 		"yt-dlp-wrap-plus": "^2.3.16"
 	},
 	"name": "ytdownloader",
-	"version": "3.15.0",
+	"version": "3.14.2",
 	"main": "main.js",
 	"scripts": {
 		"start": "electron .",
diff --git a/src/playlist.js b/src/playlist.js
index 37ae719..39a7ddb 100644
--- a/src/playlist.js
+++ b/src/playlist.js
@@ -116,13 +116,12 @@ function download(type) {
 		} else if (quality === "useConfig") {
 			format = "";
 		} else {
-			if (videoType === "mp4"){
+			if (videoType === "mp4") {
 				format = `-f "${formatId}+m4a/mp4[height=${quality}]+m4a/bv*[height<=${quality}]+ba/best[height<=${quality}]"`;
-			}
-			else if (videoType === "webm"){
+			} else if (videoType === "webm") {
 				format = `-f "webm[height<=${quality}]+opus/bv*[height<=${quality}]+ba/${formatId}+m4a/mp4[height=${quality}]+m4a/best[height<=${quality}]"`;
 			} else {
-				format = `-f "bv*[height=${quality}]+ba/best[height=${quality}]/best[height<=${quality}]"`
+				format = `-f "bv*[height=${quality}]+ba/best[height=${quality}]/best[height<=${quality}]"`;
 			}
 		}
 	} else {
@@ -153,28 +152,64 @@ function download(type) {
 			controller.signal
 		);
 	} else {
-		downloadProcess = ytdlp.exec(
-			[
-				"--yes-playlist",
-				"--no-warnings",
-				"-x",
-				"--audio-format",
-				format,
-				"-o",
-				`"${path.join(downloadDir, foldernameFormat, filenameFormat)}"`,
-				"-I",
-				`"${playlistIndex}:${playlistEnd}"`,
-				"--ffmpeg-location",
-				ffmpeg,
-				cookieArg,
-				browser,
-				configArg,
-				configTxt,
-				`"${url}"`,
-			],
-			{ shell: true, detached: false },
-			controller.signal
-		);
+		// Youtube provides m4a as audio, so no need to convert
+		if (
+			(url.includes("youtube.com/") || url.includes("youtu.be/")) &&
+			format == "m4a"
+		) {
+			downloadProcess = ytdlp.exec(
+				[
+					"--yes-playlist",
+					"--no-warnings",
+					"-f",
+					`ba[ext=${format}]/ba`,
+					"-o",
+					`"${path.join(
+						downloadDir,
+						foldernameFormat,
+						filenameFormat
+					)}"`,
+					"-I",
+					`"${playlistIndex}:${playlistEnd}"`,
+					"--ffmpeg-location",
+					ffmpeg,
+					cookieArg,
+					browser,
+					configArg,
+					configTxt,
+					`"${url}"`,
+				],
+				{ shell: true, detached: false },
+				controller.signal
+			);
+		} else {
+			downloadProcess = ytdlp.exec(
+				[
+					"--yes-playlist",
+					"--no-warnings",
+					"-x",
+					"--audio-format",
+					format,
+					"-o",
+					`"${path.join(
+						downloadDir,
+						foldernameFormat,
+						filenameFormat
+					)}"`,
+					"-I",
+					`"${playlistIndex}:${playlistEnd}"`,
+					"--ffmpeg-location",
+					ffmpeg,
+					cookieArg,
+					browser,
+					configArg,
+					configTxt,
+					`"${url}"`,
+				],
+				{ shell: true, detached: false },
+				controller.signal
+			);
+		}
 	}
 
 	downloadProcess.on("ytDlpEvent", (eventType, eventData) => {
@@ -509,14 +544,13 @@ audioToggle.addEventListener("click", (event) => {
 });
 
 getId("select").addEventListener("change", () => {
-	value = getId("select").value
-	if (value == "best" || value == "worst" || value == "useConfig"){
-		getId("typeSelectBox").style.display = "none"
-	}
-	else {
-		getId("typeSelectBox").style.display = "block"
+	value = getId("select").value;
+	if (value == "best" || value == "worst" || value == "useConfig") {
+		getId("typeSelectBox").style.display = "none";
+	} else {
+		getId("typeSelectBox").style.display = "block";
 	}
-})
+});
 
 // More options
 
@@ -576,7 +610,7 @@ getId("downloadThumbnails").textContent = i18n.__("Download thumbnails");
 getId("saveLinks").textContent = i18n.__("Save video links to a file");
 getId("useConfigTxt").textContent = i18n.__("Use config file");
 getId("errorBtn").textContent = i18n.__("Error Details") + " ▼";
-getId("clText").textContent = i18n.__("Current download location - ")
+getId("clText").textContent = i18n.__("Current download location - ");
 getId("selectLocation").textContent = i18n.__("Select Download Location");
 getId("themeTxt").textContent = i18n.__("Theme");
 getId("autoTxt").textContent = i18n.__("Auto");
@@ -589,4 +623,4 @@ getId("onedarkTxt").textContent = i18n.__("One Dark");
 getId("matrixTxt").textContent = i18n.__("Matrix");
 getId("githubTxt").textContent = i18n.__("Github");
 getId("latteTxt").textContent = i18n.__("Latte");
-getId("solarizedDarkTxt").textContent = i18n.__("Solarized Dark");
\ No newline at end of file
+getId("solarizedDarkTxt").textContent = i18n.__("Solarized Dark");
diff --git a/src/renderer.js b/src/renderer.js
index f74be65..ff7ec6b 100644
--- a/src/renderer.js
+++ b/src/renderer.js
@@ -1164,10 +1164,10 @@ getId("playlistWin").addEventListener("click", () => {
 	closeMenu();
 	ipcRenderer.send("load-win", __dirname + "/playlist.html");
 });
-getId("newPlaylistWin").addEventListener("click", () => {
-	closeMenu();
-	ipcRenderer.send("load-win", __dirname + "/playlist_new.html");
-});
+// getId("newPlaylistWin").addEventListener("click", () => {
+// 	closeMenu();
+// 	ipcRenderer.send("load-win", __dirname + "/playlist_new.html");
+// });
 
 ipcRenderer.on("link", (event, text) => {
 	pasteFromTray(text);