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

Various fixes

Browse source
This commit is contained in:
Core 2022-06-28 11:32:18 +01:00
parent 3b43947ddc
commit d97df3d796
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ export default class lastfm {
/** /**
* Base Plugin Information * Base Plugin Information
*/ */
public name: string = 'LastFM Plugin for Cider'; public name: string = 'LastFM Plugin';
public version: string = '2.0.0'; public version: string = '2.0.0';
public author: string = 'Core (Cider Collective)'; public author: string = 'Core (Cider Collective)';
@ -38,19 +38,19 @@ export default class lastfm {
// 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:url', event) console.debug(`${lastfm.name}:url`, event)
return this._lfm.getAuthenticationUrl({"cb": "cider://auth/lastfm"}) return this._lfm.getAuthenticationUrl({"cb": "cider://auth/lastfm"})
}) })
this._utils.getIPCMain().on('lastfm:auth', (event: any, token: string) => { this._utils.getIPCMain().on('lastfm:auth', (event: any, token: string) => {
console.debug('lastfm:auth', event, token) console.debug(`${lastfm.name}:auth`, event, token)
this.authenticateLastFM(token) this.authenticateLastFM(token)
}) })
this._utils.getIPCMain().on('lastfm:disconnect', (_event: any) => { this._utils.getIPCMain().on('lastfm:disconnect', (_event: any) => {
this._lfm.setSessionCredentials(null, null); this._lfm.setSessionCredentials(null, null);
this._authenticated = false; this._authenticated = false;
console.debug('lastfm:disconnect') console.debug(`${lastfm.name}:disconnect`)
}) })
this._utils.getIPCMain().on('lastfm:nowPlayingChange', (event: any, attributes: any) => { this._utils.getIPCMain().on('lastfm:nowPlayingChange', (event: any, attributes: any) => {
@ -118,7 +118,7 @@ export default class lastfm {
} }
this._utils.getWindow().webContents.send('lastfm:authenticated', session) this._utils.getWindow().webContents.send('lastfm:authenticated', session)
this._authenticated = true; this._authenticated = true;
console.debug(`[${lastfm.name}] [authenticate] Authenticated as ${session.username}`) console.debug(`[${lastfm.name}:authenticate] Authenticated as ${session.username}`)
}); });
} }
@ -131,8 +131,6 @@ export default class lastfm {
if (!attributes) return attributes; if (!attributes) return attributes;
if (!attributes.lfmAlbum) { if (!attributes.lfmAlbum) {
console.log(attributes.artistName)
console.log(attributes.albumName)
return this._lfm.album.getInfo({ return this._lfm.album.getInfo({
"artist": attributes.artistName, "artist": attributes.artistName,
"album": attributes.albumName "album": attributes.albumName
@ -198,9 +196,9 @@ export default class lastfm {
// Scrobble the track // Scrobble the track
this._lfm.track.scrobble(scrobble, (err: any, _res: any) => { this._lfm.track.scrobble(scrobble, (err: any, _res: any) => {
if (err) { if (err) {
console.error(`[${lastfm.name}] [lastfm:scrobble] Scrobble failed: ${err.message}`); console.error(`[${lastfm.name}:scrobble] Scrobble failed: ${err.message}`);
} else { } else {
console.debug(`[${lastfm.name}] [lastfm:scrobble] Track scrobbled: ${scrobble.artist} - ${scrobble.track}`); console.debug(`[${lastfm.name}:scrobble] Track scrobbled: ${scrobble.artist} - ${scrobble.track}`);
this._scrobbleCache = scrobble this._scrobbleCache = scrobble
} }
}); });
@ -221,10 +219,10 @@ export default class lastfm {
this._lfm.track.updateNowPlaying(nowPlaying, (err: any, res: any) => { this._lfm.track.updateNowPlaying(nowPlaying, (err: any, res: any) => {
if (err) { if (err) {
console.error(`[${lastfm.name}] [lastfm:updateNowPlaying] Now Playing Update failed: ${err.message}`); console.error(`[${lastfm.name}:updateNowPlaying] Now Playing Update failed: ${err.message}`);
} else { } else {
console.log(res) console.log(res)
console.debug(`[${lastfm.name}] [lastfm:updateNowPlaying] Now Playing Updated: ${nowPlaying.artist} - ${nowPlaying.track}`); console.debug(`[${lastfm.name}:updateNowPlaying] Now Playing Updated: ${nowPlaying.artist} - ${nowPlaying.track}`);
this._nowPlayingCache = nowPlaying this._nowPlayingCache = nowPlaying
} }
}); });