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

Merge pull request #504 from inalone/filterAlbumNameFromDev

Browse source 
last.fm: initial implementation of filterAlbumName
This commit is contained in:
vapormusic 2022-02-22 20:01:16 +07:00 • committed by GitHub
commit 9c958d531c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,7 @@ export default class LastFMPlugin {
} }
const artist = await this.getPrimaryArtist(attributes) const artist = await this.getPrimaryArtist(attributes)
const album = this.getAlbumName(attributes)
if (currentAttributes.status && currentAttributes === attributes) { if (currentAttributes.status && currentAttributes === attributes) {
if (fs.existsSync(this.sessionPath)) { if (fs.existsSync(this.sessionPath)) {
@ -101,7 +102,7 @@ export default class LastFMPlugin {
self._lastfm.track.scrobble({ self._lastfm.track.scrobble({
'artist': artist, 'artist': artist,
'track': attributes.name, 'track': attributes.name,
'album': attributes.albumName, 'album': album,
'albumArtist': artist, 'albumArtist': artist,
'timestamp': new Date().getTime() / 1000 'timestamp': new Date().getTime() / 1000
}, function (err: any, scrobbled: any) { }, function (err: any, scrobbled: any) {
@ -133,13 +134,14 @@ export default class LastFMPlugin {
if (fs.existsSync(this.sessionPath)) { if (fs.existsSync(this.sessionPath)) {
const artist = await this.getPrimaryArtist(attributes) const artist = await this.getPrimaryArtist(attributes)
const album = this.getAlbumName(attributes)
// update Now Playing // update Now Playing
if (attributes.status === true) { if (attributes.status === true) {
this._lastfm.track.updateNowPlaying({ this._lastfm.track.updateNowPlaying({
'artist': artist, 'artist': artist,
'track': attributes.name, 'track': attributes.name,
'album': attributes.albumName, 'album': album,
'albumArtist': artist 'albumArtist': artist
}, function (err: any, nowPlaying: any) { }, function (err: any, nowPlaying: any) {
if (err) { if (err) {
@ -156,6 +158,10 @@ export default class LastFMPlugin {
} }
} }
private getAlbumName(attributes: any): string {
return attributes.albumName.replace(/ - Single| - EP/g, '');
}
private async getPrimaryArtist(attributes: any) { private async getPrimaryArtist(attributes: any) {
const songId = attributes.playParams.catalogId || attributes.playParams.id const songId = attributes.playParams.catalogId || attributes.playParams.id