From 47e3ad5b446a8af3f0d04b574581cecd358c79d6 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 15 Jun 2022 21:33:32 +0100
Subject: [PATCH] removed redundant code

---
 src/preload/cider-preload.js | 49 +++++++-----------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js
index 44ba7589..3923fbd3 100644
--- a/src/preload/cider-preload.js
+++ b/src/preload/cider-preload.js
@@ -11,9 +11,6 @@ const MusicKitInterop = {
 			if (MusicKitInterop.filterTrack(attributes, true, false)) {
 				global.ipcRenderer.send('playbackStateDidChange', attributes)
 				global.ipcRenderer.send('wsapi-updatePlaybackState', attributes);
-				// if (typeof _plugins != "undefined") {
-				//     _plugins.execute("OnPlaybackStateChanged", {Attributes: MusicKitInterop.getAttributes()})
-				// }
 			}
 		});
 
@@ -24,7 +21,7 @@ const MusicKitInterop = {
 		/** wsapi */
 
 		MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => {
-			console.debug('nowPlayingItemDidChange')
+			console.debug('[cider:preload] nowPlayingItemDidChange')
 			const attributes = MusicKitInterop.getAttributes()
 			const trackFilter = MusicKitInterop.filterTrack(attributes, false, true)
 
@@ -32,12 +29,6 @@ const MusicKitInterop = {
 				global.ipcRenderer.send('nowPlayingItemDidChange', attributes);
 			}
 
-			// LastFM's Custom Call
-			await MusicKitInterop.modifyNamesOnLocale();
-			if (trackFilter || !app.cfg.lastfm.filterLoop) {
-				global.ipcRenderer.send('nowPlayingItemDidChangeLastFM', attributes);
-			}
-
 			if (MusicKit.getInstance().nowPlayingItem) {
 				await this.sleep(750);
 				MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate;
@@ -49,38 +40,16 @@ const MusicKitInterop = {
 		})
 
 		MusicKit.getInstance().addEventListener(MusicKit.Events.mediaPlaybackError, (e) => {
-			console.warn(`[mediaPlaybackError] ${e}`);
+			console.warn(`[cider:preload] mediaPlaybackError] ${e}`);
 		})
 	},
 
 	sleep(ms) {
 		return new Promise((resolve) => {
-		  setTimeout(resolve, ms);
+			setTimeout(resolve, ms);
 		});
 	},
 
-	async modifyNamesOnLocale() {
-		if (app.mklang === '' || app.mklang == null) {
-			return;
-		} 
-		const mk = MusicKit.getInstance()
-		const nowPlayingItem = mk.nowPlayingItem;
-		if ((nowPlayingItem?._songId ?? nowPlayingItem?.songId) == null){
-			return;
-		} 
-		const id = nowPlayingItem?._songId ?? (nowPlayingItem?.songId ?? nowPlayingItem?.id)
-		if (id != null && id !== -1) {
-			try{
-			const query = await mk.api.v3.music(`/v1${(((nowPlayingItem?._songId ?? nowPlayingItem?.songId) != null) && ((nowPlayingItem?._songId ?? nowPlayingItem?.songId) !== -1)) ? `/catalog/${mk.storefrontId}/` : `/me/library/`}songs/${id}?l=${app.mklang}`);
-			if (query?.data?.data[0]){
-					let attrs = query?.data?.data[0]?.attributes;
-					if (attrs?.name) { nowPlayingItem.attributes.name = attrs?.name ?? ''}
-					if (attrs?.albumName) { nowPlayingItem.attributes.albumName = attrs?.albumName ?? ''}
-					if (attrs?.artistName) { nowPlayingItem.attributes.artistName = attrs?.artistName ?? ''}
-
-			}} catch (e) { }
-		} else {}
-	},
 	getAttributes: function () {
 		const mk = MusicKit.getInstance()
 		const nowPlayingItem = mk.nowPlayingItem;
@@ -96,8 +65,8 @@ const MusicKitInterop = {
 		attributes.playParams = attributes?.playParams ?? {id: 'no-id-found'};
 		attributes.playParams.id = attributes?.playParams?.id ?? 'no-id-found';
 		attributes.url = {
-			cider: `https://cider.sh/link?play/s/${nowPlayingItem?._songId ?? (nowPlayingItem?.songId ??'no-id-found')}`,
-			appleMusic: attributes.websiteUrl ? attributes.websiteUrl : `https://music.apple.com/${mk.storefrontId}/song/${nowPlayingItem?._songId ?? (nowPlayingItem?.songId ??'no-id-found')}`  
+			cider: `https://cider.sh/link?play/s/${nowPlayingItem?._songId ?? (nowPlayingItem?.songId ?? 'no-id-found')}`,
+			appleMusic: attributes.websiteUrl ? attributes.websiteUrl : `https://music.apple.com/${mk.storefrontId}/song/${nowPlayingItem?._songId ?? (nowPlayingItem?.songId ?? 'no-id-found')}`
 		}
 		if (attributes.playParams.id === 'no-id-found') {
 			attributes.playParams.id = nowPlayingItem?.id ?? 'no-id-found';
@@ -115,7 +84,7 @@ const MusicKitInterop = {
 			attributes?.playParams?.id === cache.playParams.id
 				? Date.now() + attributes?.remainingTime
 				: attributes?.startTime + attributes?.durationInMillis
-		);	
+		);
 		return attributes;
 	},
 
@@ -156,19 +125,19 @@ const MusicKitInterop = {
 		// } catch (e) { }
 		// if (MusicKit.getInstance().queue.nextPlayableItemIndex != -1 && MusicKit.getInstance().queue.nextPlayableItemIndex != null)
 		// MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.nextPlayableItemIndex);
-		MusicKit.getInstance().skipToNextItem().then(r => console.debug(`[MusicKitInterop.next] Skipping to Next ${r}`));
+		MusicKit.getInstance().skipToNextItem().then(r => console.debug(`[cider:preload] [next] Skipping to Next ${r}`));
 	},
 
 	previous: () => {
 		// if (MusicKit.getInstance().queue.previousPlayableItemIndex != -1 && MusicKit.getInstance().queue.previousPlayableItemIndex != null)
 		// MusicKit.getInstance().changeToMediaAtIndex(MusicKit.getInstance().queue.previousPlayableItemIndex);
-		MusicKit.getInstance().skipToPreviousItem().then(r => console.debug(`[MusicKitInterop.previous] Skipping to Previous ${r}`));
+		MusicKit.getInstance().skipToPreviousItem().then(r => console.debug(`[cider:preload] [previous] Skipping to Previous ${r}`));
 	}
 
 }
 
 
 process.once('loaded', () => {
-	console.debug("Setting ipcRenderer")
+	console.debug("[cider:preload] IPC Listeners Created!")
 	global.MusicKitInterop = MusicKitInterop;
 });