From 3831e61d106b5f9cfa61971ba3ca011a70b7bf3b Mon Sep 17 00:00:00 2001
From: Araxeus <oaeben@gmail.com>
Date: Sat, 8 May 2021 19:45:33 +0300
Subject: [PATCH] differentiate names of different metadata sources

---
 plugins/downloader/back.js       | 12 ++++++------
 plugins/downloader/youtube-dl.js |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/downloader/back.js b/plugins/downloader/back.js
index 43e385bb..9d7b95b6 100644
--- a/plugins/downloader/back.js
+++ b/plugins/downloader/back.js
@@ -22,13 +22,13 @@ const sendError = (win, err) => {
 	dialog.showMessageBox(dialogOpts);
 };
 
-let metadata = {};
+let nowPlayingMetadata = {};
 
 function handle(win) {
 	injectCSS(win.webContents, join(__dirname, "style.css"));
 	const registerCallback = getSongInfo(win);
 	registerCallback((info) => {
-		metadata = info;
+		nowPlayingMetadata = info;
 	});
 
 	listenAction(CHANNEL, (event, action, arg) => {
@@ -37,7 +37,7 @@ function handle(win) {
 				sendError(win, arg);
 				break;
 			case ACTIONS.METADATA:
-				event.returnValue = JSON.stringify(metadata);
+				event.returnValue = JSON.stringify(nowPlayingMetadata);
 				break;
 			case ACTIONS.PROGRESS: //arg = progress
 				win.setProgressBar(arg);
@@ -50,13 +50,13 @@ function handle(win) {
 	ipcMain.on("add-metadata", async (event, filePath, songBuffer, currentMetadata) => {
 		let fileBuffer = songBuffer;
 		let songMetadata;
-		if (currentMetadata.imageSrc) { // means metadata come from ytpl.getInfo();
+		if (currentMetadata.imageSrcYTPL) { // means metadata come from ytpl.getInfo();
 			songMetadata = {
 				...currentMetadata,
-				image: cropMaxWidth(await getImage(currentMetadata.imageSrc))
+				image: cropMaxWidth(await getImage(currentMetadata.imageSrcYTPL))
 			};
 		} else {
-			songMetadata = { ...metadata, ...currentMetadata };
+			songMetadata = { ...nowPlayingMetadata, ...currentMetadata };
 		}
 
 		try {
diff --git a/plugins/downloader/youtube-dl.js b/plugins/downloader/youtube-dl.js
index 7edf8143..7e54195a 100644
--- a/plugins/downloader/youtube-dl.js
+++ b/plugins/downloader/youtube-dl.js
@@ -42,7 +42,7 @@ const downloadVideoToMP3 = async (
 		metadata = {
 			artist: videoDetails?.media?.artist || cleanupArtistName(videoDetails?.author?.name) || "",
 			title: videoDetails?.media?.song || videoDetails?.title || "",
-			imageSrc: thumbnails ? 
+			imageSrcYTPL: thumbnails ? 
 				UrlToJPG(thumbnails[thumbnails.length - 1].url, videoDetails?.videoId) 
 				: ""
 		}
@@ -149,7 +149,7 @@ const toMP3 = async (
 		ipcRenderer.send("add-metadata", filePath, fileBuffer, {
 			artist: metadata.artist,
 			title: metadata.title,
-			imageSrc: metadata.imageSrc
+			imageSrcYTPL: metadata.imageSrcYTPL
 		});
 		ipcRenderer.once("add-metadata-done", reinit);
 	} catch (e) {