diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 24b9639f..5a7043ff 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -331,7 +331,6 @@ "settings.option.connectivity.lastfmScrobble.delay": "Last.fm Scrobble Delay (%)", "settings.option.connectivity.lastfmScrobble.nowPlaying": "Enable Last.fm Now Playing", "settings.option.connectivity.lastfmScrobble.removeFeatured": "Remove featuring artists from song title (Last.fm)", - "settings.option.connectivity.lastfmScrobble.filterAlbumName": "Filter attributes from album name (Last.fm)", "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.fm)", "settings.header.debug": "Debug", "settings.option.debug.copy_log": "Copy logs to clipboard", diff --git a/src/main/base/store.ts b/src/main/base/store.ts index 20cca9a3..4436b3fc 100644 --- a/src/main/base/store.ts +++ b/src/main/base/store.ts @@ -103,7 +103,6 @@ export class Store { "scrobble_after": 30, "auth_token": "", "enabledRemoveFeaturingArtists": true, - "filterAlbumName": false, "filterLoop": true, "NowPlaying": "true" }, diff --git a/src/main/plugins/lastfm.ts b/src/main/plugins/lastfm.ts index 2ca26892..f35befa6 100644 --- a/src/main/plugins/lastfm.ts +++ b/src/main/plugins/lastfm.ts @@ -93,6 +93,7 @@ export default class LastFMPlugin { } const artist = await this.getPrimaryArtist(attributes) + const album = this.getAlbumName(attributes) if (currentAttributes.status && currentAttributes === attributes) { if (fs.existsSync(this.sessionPath)) { @@ -101,7 +102,7 @@ export default class LastFMPlugin { self._lastfm.track.scrobble({ 'artist': artist, 'track': attributes.name, - 'album': this.getAlbumName(attributes), + 'album': album, 'albumArtist': artist, 'timestamp': new Date().getTime() / 1000 }, function (err: any, scrobbled: any) { @@ -133,13 +134,14 @@ export default class LastFMPlugin { if (fs.existsSync(this.sessionPath)) { const artist = await this.getPrimaryArtist(attributes) + const album = this.getAlbumName(attributes) // update Now Playing if (attributes.status === true) { this._lastfm.track.updateNowPlaying({ 'artist': artist, 'track': attributes.name, - 'album': this.getAlbumName(attributes), + 'album': album, 'albumArtist': artist }, function (err: any, nowPlaying: any) { if (err) { @@ -157,10 +159,6 @@ export default class LastFMPlugin { } private getAlbumName(attributes: any): string { - if (!this._store.lastfm.filterAlbumName) { - return attributes.albumName; - } - return attributes.albumName.replace(/ - Single| - EP/g, ''); } diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs index 7c1964e3..dc09e212 100644 --- a/src/renderer/views/pages/settings.ejs +++ b/src/renderer/views/pages/settings.ejs @@ -606,14 +606,6 @@ -