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

Revert "LastFM can be unique and have its own call"

Browse source 
This reverts commit d36e1b19f6.
This commit is contained in:
Core 2022-02-17 01:01:17 +00:00
parent 51393397e5
commit f156083d48
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/index.ts
View file

@ -69,10 +69,6 @@ ipcMain.on('nowPlayingItemDidChange', (_event, attributes) => {
CiderPlug.callPlugins('onNowPlayingItemDidChange', attributes); CiderPlug.callPlugins('onNowPlayingItemDidChange', attributes);
}); });
ipcMain.on('lfmItemChange', (_event, attributes) => {
CiderPlug.callPlugins('lfmItemChange', attributes);
});
app.on('before-quit', () => { app.on('before-quit', () => {
CiderPlug.callPlugins('onBeforeQuit'); CiderPlug.callPlugins('onBeforeQuit');
console.warn(`${app.getName()} exited.`); console.warn(`${app.getName()} exited.`);

2
src/main/plugins/lastfm.ts
View file

@ -265,7 +265,7 @@ export default class LastFMPlugin {
* Runs on song change * Runs on song change
* @param attributes Music Attributes * @param attributes Music Attributes
*/ */
lfmItemChange(attributes: object): void { onNowPlayingItemDidChange(attributes: object): void {
if (!this._store.lastfm.filterLoop){ if (!this._store.lastfm.filterLoop){
this._lastfm.cachedNowPlayingAttributes = false; this._lastfm.cachedNowPlayingAttributes = false;
this._lastfm.cachedAttributes = false} this._lastfm.cachedAttributes = false}

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

@ -25,10 +25,8 @@ const MusicKitInterop = {
MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => { MusicKit.getInstance().addEventListener(MusicKit.Events.nowPlayingItemDidChange, async () => {
// await MusicKitInterop.modifyNamesOnLocale(); // await MusicKitInterop.modifyNamesOnLocale();
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('lfmItemChange', MusicKitInterop.getAttributes()); global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes());
} }
global.ipcRenderer.send('nowPlayingItemDidChange', MusicKitInterop.getAttributes());
}); });
MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => { MusicKit.getInstance().addEventListener(MusicKit.Events.authorizationStatusDidChange, () => {