okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed indentations

Browse source
This commit is contained in:
Core 2022-01-28 16:32:57 +00:00
parent 09db8af283
commit 9945f88beb
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
1 changed files with 92 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

180
src/preload/cider-preload.js
View file

@ -2,109 +2,113 @@ global.ipcRenderer = require('electron').ipcRenderer;
console.log('Loaded Preload') console.log('Loaded Preload')
let cache = {playParams: {id: 0}, status: null, remainingTime: 0}, let cache = {playParams: {id: 0}, status: null, remainingTime: 0},
playbackCache = {status: null, time: Date.now()}; playbackCache = {status: null, time: Date.now()};
const MusicKitInterop = { const MusicKitInterop = {
init: function () { init: function () {
MusicKit.getInstance().addEventListener(MusicKit.Events.playbackStateDidChange, () => { MusicKit.getInstance().addEventListener(MusicKit.Events.playbackStateDidChange, () => {
if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), true, false)) { if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), true, false)) {
global.ipcRenderer.send('playbackStateDidChange', MusicKitInterop.getAttributes()) global.ipcRenderer.send('playbackStateDidChange', MusicKitInterop.getAttributes())
ipcRenderer.send('wsapi-updatePlaybackState', MusicKitInterop.getAttributes()); ipcRenderer.send('wsapi-updatePlaybackState', MusicKitInterop.getAttributes());
// if (typeof _plugins != "undefined") { // if (typeof _plugins != "undefined") {
// _plugins.execute("OnPlaybackStateChanged", {Attributes: MusicKitInterop.getAttributes()}) // _plugins.execute("OnPlaybackStateChanged", {Attributes: MusicKitInterop.getAttributes()})
// } // }
} }
}); });
/** wsapi */ /** wsapi */
MusicKit.getInstance().addEventListener(MusicKit.Events.playbackProgressDidChange, () => { MusicKit.getInstance().addEventListener(MusicKit.Events.playbackProgressDidChange, () => {
ipcRenderer.send('wsapi-updatePlaybackState', MusicKitInterop.getAttributes()); ipcRenderer.send('wsapi-updatePlaybackState', MusicKitInterop.getAttributes());
}); });
/** wsapi */ /** wsapi */
MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, () => { MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, () => {
if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true) || !app.cfg.lastfm.filterLoop) { if (MusicKitInterop.filterTrack(MusicKitInterop.getAttributes(), false, true) || !app.cfg.lastfm.filterLoop) {
global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes()); global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes());
} }
}); });
MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => { MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => {
global.ipcRenderer.send('authorizationStatusDidChange', MusicKit.getInstance().authorizationStatus) global.ipcRenderer.send('authorizationStatusDidChange', MusicKit.getInstance().authorizationStatus)
}) })
MusicKit.getInstance().addEventListener(MusicKit.Events.mediaPlaybackError, (e) => { MusicKit.getInstance().addEventListener(MusicKit.Events.mediaPlaybackError, (e) => {
console.warn(`[mediaPlaybackError] ${e}`); console.warn(`[mediaPlaybackError] ${e}`);
}) })
}, },
getAttributes: function () { getAttributes: function () {
const mk = MusicKit.getInstance() const mk = MusicKit.getInstance()
const nowPlayingItem = mk.nowPlayingItem; const nowPlayingItem = mk.nowPlayingItem;
const isPlayingExport = mk.isPlaying; const isPlayingExport = mk.isPlaying;
const remainingTimeExport = mk.currentPlaybackTimeRemaining; const remainingTimeExport = mk.currentPlaybackTimeRemaining;
const attributes = (nowPlayingItem != null ? nowPlayingItem.attributes : {}); const attributes = (nowPlayingItem != null ? nowPlayingItem.attributes : {});
attributes.storefrontId = storefrontId; attributes.status = isPlayingExport ?? false;
attributes.status = isPlayingExport ?? false; attributes.name = attributes?.name ?? 'No Title Found';
attributes.name = attributes?.name ?? 'No Title Found'; attributes.artwork = attributes?.artwork ?? {url: ''};
attributes.artwork = attributes?.artwork ?? { url: '' }; attributes.artwork.url = (attributes?.artwork?.url ?? '').replace(`{f}`, "png");
attributes.artwork.url = (attributes?.artwork?.url ?? '').replace(`{f}`,"png"); attributes.playParams = attributes?.playParams ?? {id: 'no-id-found'};
attributes.playParams = attributes?.playParams ?? { id: 'no-id-found' }; attributes.playParams.id = attributes?.playParams?.id ?? 'no-id-found';
attributes.playParams.id = attributes?.playParams?.id ?? 'no-id-found'; attributes.playParams.songid = nowPlayingItem.songId ?? 'no-id-found'
attributes.playParams.songid = nowPlayingItem.songId ?? 'no-id-found' attributes.url = {
attribtues.url = { cider: "https://cider.sh/p?id=" + attributes.playParams.id, appleMusic: "https://music.apple.com/song/" + nowPlayingItem.songId } cider: "https://cider.sh/p?id=" + attributes.playParams.id,
if (attributes.playParams.id === 'no-id-found') { attributes.playParams.id = nowPlayingItem?.id ?? 'no-id-found'; } appleMusic: "https://music.apple.com/song/" + nowPlayingItem.songId
attributes.albumName = attributes?.albumName ?? ''; }
attributes.artistName = attributes?.artistName ?? ''; if (attributes.playParams.id === 'no-id-found') {
attributes.genreNames = attributes?.genreNames ?? []; attributes.playParams.id = nowPlayingItem?.id ?? 'no-id-found';
attributes.remainingTime = remainingTimeExport }
? remainingTimeExport * 1000 attributes.albumName = attributes?.albumName ?? '';
: 0; attributes.artistName = attributes?.artistName ?? '';
attributes.durationInMillis = attributes?.durationInMillis ?? 0; attributes.genreNames = attributes?.genreNames ?? [];
attributes.startTime = Date.now(); attributes.remainingTime = remainingTimeExport
attributes.endTime = Math.round( ? remainingTimeExport * 1000
attributes?.playParams?.id === cache.playParams.id : 0;
? Date.now() + attributes?.remainingTime attributes.durationInMillis = attributes?.durationInMillis ?? 0;
: attributes?.startTime + attributes?.durationInMillis attributes.startTime = Date.now();
); attributes.endTime = Math.round(
return attributes; attributes?.playParams?.id === cache.playParams.id
}, ? Date.now() + attributes?.remainingTime
: attributes?.startTime + attributes?.durationInMillis
);
return attributes;
},
filterTrack: function (a, playbackCheck, mediaCheck) { filterTrack: function (a, playbackCheck, mediaCheck) {
if (a.title === "No Title Found" || a.playParams.id === "no-id-found" ) { if (a.title === "No Title Found" || a.playParams.id === "no-id-found") {
return; return;
} else if (mediaCheck && a.playParams.id === cache.playParams.id) { } else if (mediaCheck && a.playParams.id === cache.playParams.id) {
return; return;
} else if (playbackCheck && a.status === playbackCache.status) { } else if (playbackCheck && a.status === playbackCache.status) {
return; return;
} else if (playbackCheck && !a.status && a.remainingTime === playbackCache.time) { /* Pretty much have to do this to prevent multiple runs when a song starts playing */ } else if (playbackCheck && !a.status && a.remainingTime === playbackCache.time) { /* Pretty much have to do this to prevent multiple runs when a song starts playing */
return; return;
} }
cache = a; cache = a;
if (playbackCheck) playbackCache = {status: a.status, time: a.remainingTime}; if (playbackCheck) playbackCache = {status: a.status, time: a.remainingTime};
return true; return true;
}, },
pausePlay: function () { pausePlay: function () {
if (MusicKit.getInstance().isPlaying) { if (MusicKit.getInstance().isPlaying) {
MusicKit.getInstance().pause(); MusicKit.getInstance().pause();
} else if (MusicKit.getInstance().nowPlayingItem != null) { } else if (MusicKit.getInstance().nowPlayingItem != null) {
MusicKit.getInstance().play().then(r => console.log(`[MusicKitInterop] Playing ${r}`)); MusicKit.getInstance().play().then(r => console.log(`[MusicKitInterop] Playing ${r}`));
} }
}, },
nextTrack: function () { nextTrack: function () {
MusicKit.getInstance().skipToNextItem().then(r => console.log(`[MusicKitInterop] Skipping to Next ${r}`)); MusicKit.getInstance().skipToNextItem().then(r => console.log(`[MusicKitInterop] Skipping to Next ${r}`));
}, },
previousTrack: function () { previousTrack: function () {
MusicKit.getInstance().skipToPreviousItem().then(r => console.log(`[MusicKitInterop] Skipping to Previous ${r}`)); MusicKit.getInstance().skipToPreviousItem().then(r => console.log(`[MusicKitInterop] Skipping to Previous ${r}`));
} }
} }
process.once('loaded', () => { process.once('loaded', () => {
console.log("Setting ipcRenderer") console.log("Setting ipcRenderer")
global.MusicKitInterop = MusicKitInterop; global.MusicKitInterop = MusicKitInterop;
}); });