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

lastfm annoying

Browse source
This commit is contained in:
Core 2022-08-31 12:44:38 +01:00
parent 93666366a5
commit 720970b2e2
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,9 @@ export default class lastfm {
onReady(_win: Electron.BrowserWindow): void { onReady(_win: Electron.BrowserWindow): void {
this.initializeLastFM("", this._apiCredentials); this.initializeLastFM("", this._apiCredentials);
}
onRendererReady(): void {
// Register the ipcMain handlers // Register the ipcMain handlers
this._utils.getIPCMain().handle("lastfm:url", (event: any) => { this._utils.getIPCMain().handle("lastfm:url", (event: any) => {
console.debug(`[${lastfm.name}:url] Called.`); console.debug(`[${lastfm.name}:url] Called.`);
@ -52,28 +54,17 @@ export default class lastfm {
this.updateNowPlayingTrack(attributes); this.updateNowPlayingTrack(attributes);
}); });
this._utils.getIPCMain().on("lastfm:FilteredNowPlayingItemDidChange", (event: any, attributes: any) => {
if (this._utils.getStoreValue("general.privateEnabled")) return;
this.updateNowPlayingTrack(attributes);
});
this._utils.getIPCMain().on("lastfm:scrobbleTrack", (event: any, attributes: any) => { this._utils.getIPCMain().on("lastfm:scrobbleTrack", (event: any, attributes: any) => {
if (this._utils.getStoreValue("general.privateEnabled")) return; if (this._utils.getStoreValue("general.privateEnabled")) return;
this.scrobbleTrack(attributes); this.scrobbleTrack(attributes);
}); });
} }
/**
* Runs on playback State Change
* @param attributes Music Attributes (attributes.status = current state)
*/
onPlaybackStateDidChange(attributes: object): void {}
/**
* Runs on song change
* @param attributes Music Attributes
* @param scrobble
*/
onNowPlayingItemDidChange(attributes: any, scrobble = false): void {
if (this._utils.getStoreValue("general.privateEnabled")) return;
this.updateNowPlayingTrack(attributes);
}
/** /**
* Initialize LastFM * Initialize LastFM
* @param token * @param token

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

@ -38,8 +38,10 @@ const MusicKitInterop = {
const attributes = MusicKitInterop.getAttributes(); const attributes = MusicKitInterop.getAttributes();
attributes.primaryArtist = app.cfg.connectivity.lastfm.remove_featured ? await this.fetchPrimaryArtist() : attributes.artistName; attributes.primaryArtist = app.cfg.connectivity.lastfm.remove_featured ? await this.fetchPrimaryArtist() : attributes.artistName;
global.ipcRenderer.send("nowPlayingItemDidChange", attributes);
if (MusicKitInterop.filterTrack(attributes, false, true)) { if (MusicKitInterop.filterTrack(attributes, false, true)) {
global.ipcRenderer.send("nowPlayingItemDidChange", attributes); global.ipcRenderer.send("lastfm:FilteredNowPlayingItemDidChange", attributes);
} else if (attributes.name !== "no-title-found" && attributes.playParams.id !== "no-id-found") { } else if (attributes.name !== "no-title-found" && attributes.playParams.id !== "no-id-found") {
global.ipcRenderer.send("lastfm:nowPlayingChange", attributes); global.ipcRenderer.send("lastfm:nowPlayingChange", attributes);
} }