Merge pull request #213 from th-ch/song-info-front

Pass metadata to front + use metadata URL in downloader

plugins/downloader/front.js

@@ -35,7 +35,7 @@ const reinit = () => {
 // contextBridge.exposeInMainWorld("downloader", {
 // 	download: () => {
 global.download = () => {
-	const videoUrl = window.location.href;
+	const videoUrl = global.songInfo.url || window.location.href;
 
 	downloadVideoToMP3(
 		videoUrl,

plugins/downloader/menu.js

@@ -7,71 +7,84 @@ const is = require("electron-is");
 const ytpl = require("ytpl");
 
 const { setOptions } = require("../../config/plugins");
+const getSongInfo = require("../../providers/song-info");
 const { sendError } = require("./back");
 const { defaultMenuDownloadLabel, getFolder } = require("./utils");
 
 let downloadLabel = defaultMenuDownloadLabel;
+let metadataURL = undefined;
+let callbackIsRegistered = false;
 
-module.exports = (win, options, refreshMenu) => [
+module.exports = (win, options, refreshMenu) => {
-	{
+	if (!callbackIsRegistered) {
-		label: downloadLabel,
+		const registerCallback = getSongInfo(win);
-		click: async () => {
+		registerCallback((info) => {
-			const currentURL = win.webContents.getURL();
+			metadataURL = info.url;
-			const playlistID = new URL(currentURL).searchParams.get("list");
+		});
-			if (!playlistID) {
+		callbackIsRegistered = true;
-				sendError(win, new Error("No playlist ID found"));
+	}
-				return;
-			}
 
-			const playlist = await ytpl(playlistID);
+	return [
-			const playlistTitle = playlist.title;
+		{
+			label: downloadLabel,
+			click: async () => {
+				const currentURL = metadataURL || win.webContents.getURL();
+				const playlistID = new URL(currentURL).searchParams.get("list");
+				if (!playlistID) {
+					sendError(win, new Error("No playlist ID found"));
+					return;
+				}
 
-			const folder = getFolder(options.downloadFolder);
+				const playlist = await ytpl(playlistID);
-			const playlistFolder = join(folder, playlistTitle);
+				const playlistTitle = playlist.title;
-			if (existsSync(playlistFolder)) {
-				sendError(
-					win,
-					new Error(`The folder ${playlistFolder} already exists`)
-				);
-				return;
-			}
-			mkdirSync(playlistFolder, { recursive: true });
 
-			ipcMain.on("downloader-feedback", (_, feedback) => {
+				const folder = getFolder(options.downloadFolder);
-				downloadLabel = feedback;
+				const playlistFolder = join(folder, playlistTitle);
+				if (existsSync(playlistFolder)) {
+					sendError(
+						win,
+						new Error(`The folder ${playlistFolder} already exists`)
+					);
+					return;
+				}
+				mkdirSync(playlistFolder, { recursive: true });
+
+				ipcMain.on("downloader-feedback", (_, feedback) => {
+					downloadLabel = feedback;
+					refreshMenu();
+				});
+
+				downloadLabel = `Downloading "${playlistTitle}"`;
 				refreshMenu();
-			});
 
-			downloadLabel = `Downloading "${playlistTitle}"`;
+				if (is.dev()) {
-			refreshMenu();
+					console.log(
+						`Downloading playlist "${playlistTitle}" (${playlist.items.length} songs)`
+					);
+				}
 
-			if (is.dev()) {
+				playlist.items.slice(0, options.playlistMaxItems).forEach((song) => {
-				console.log(
+					win.webContents.send(
-					`Downloading playlist "${playlistTitle}" (${playlist.items.length} songs)`
+						"downloader-download-playlist",
-				);
+						song,
-			}
+						playlistTitle,
-
+						options
-			playlist.items.slice(0, options.playlistMaxItems).forEach((song) => {
+					);
-				win.webContents.send(
+				});
-					"downloader-download-playlist",
+			},
-					song,
-					playlistTitle,
-					options
-				);
-			});
 		},
-	},
+		{
-	{
+			label: "Choose download folder",
-		label: "Choose download folder",
+			click: () => {
-		click: () => {
+				let result = dialog.showOpenDialogSync({
-			let result = dialog.showOpenDialogSync({
+					properties: ["openDirectory", "createDirectory"],
-				properties: ["openDirectory", "createDirectory"],
+					defaultPath: getFolder(options.downloadFolder),
-				defaultPath: getFolder(options.downloadFolder),
+				});
-			});
+				if (result) {
-			if (result) {
+					options.downloadFolder = result[0];
-				options.downloadFolder = result[0];
+					setOptions("downloader", options);
-				setOptions("downloader", options);
+				} // else = user pressed cancel
-			} // else = user pressed cancel
+			},
 		},
-	},
+	];
-];
+};

providers/song-info-front.js

@@ -1,5 +1,11 @@
 const { ipcRenderer } = require("electron");
 
+global.songInfo = {};
+
+ipcRenderer.on("update-song-info", (_, extractedSongInfo) => {
+	global.songInfo = JSON.parse(extractedSongInfo);
+});
+
 const injectListener = () => {
 	var oldXHR = window.XMLHttpRequest;
 	function newXHR() {

providers/song-info.js

@@ -36,13 +36,13 @@ const songInfo = {
 	uploadDate: "",
 	imageSrc: "",
 	image: null,
-	isPaused: true,
+	isPaused: undefined,
 	songDuration: 0,
 	elapsedSeconds: 0,
 	url: "",
 };
 
-const handleData = async (_event, responseText) => {
+const handleData = async (responseText, win) => {
 	let data = JSON.parse(responseText);
 	songInfo.title = data?.videoDetails?.title;
 	songInfo.artist = data?.videoDetails?.author;
@@ -52,6 +52,8 @@ const handleData = async (_event, responseText) => {
 	songInfo.image = await getImage(songInfo.imageSrc);
 	songInfo.uploadDate = data?.microformat?.microformatDataRenderer?.uploadDate;
 	songInfo.url = data?.microformat?.microformatDataRenderer?.urlCanonical;
+
+	win.webContents.send("update-song-info", JSON.stringify(songInfo));
 };
 
 const registerProvider = (win) => {
@@ -77,7 +79,12 @@ const registerProvider = (win) => {
 	});
 
 	// This will be called when the song-info-front finds a new request with song data
-	ipcMain.on("song-info-request", handleData);
+	ipcMain.on("song-info-request", async (_, responseText) => {
+		await handleData(responseText, win);
+		callbacks.forEach((c) => {
+			c(songInfo);
+		});
+	});
 
 	return registerCallback;
 };