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

lastfm fallbacks added, removed single/ep from album names

Browse source
This commit is contained in:
Core 2022-08-24 11:50:32 +01:00
parent f38fb88cd2
commit d2de10b8b6
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/base/store.ts
View file

@ -81,7 +81,7 @@ export class Store {
scrobble_after: 50, scrobble_after: 50,
filter_loop: false, filter_loop: false,
filter_types: {}, filter_types: {},
remove_featured: false, remove_featured: true,
secrets: { secrets: {
username: "", username: "",
key: "", key: "",

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

@ -8,14 +8,13 @@ export default class lastfm {
private _apiCredentials = { private _apiCredentials = {
key: "f9986d12aab5a0fe66193c559435ede3", key: "f9986d12aab5a0fe66193c559435ede3",
secret: "acba3c29bd5973efa38cc2f0b63cc625", secret: "acba3c29bd5973efa38cc2f0b63cc625"
}; };
/** /**
* Plugin Initialization * Plugin Initialization
*/ */
private _lfm: any = null; private _lfm: any = null;
private _authenticated: boolean = false; private _authenticated: boolean = false;
private _scrobbleDelay: any = null;
private _utils: any = null; private _utils: any = null;
private _scrobbleCache: any = {}; private _scrobbleCache: any = {};
private _nowPlayingCache: any = {}; private _nowPlayingCache: any = {};
@ -63,7 +62,8 @@ export default class lastfm {
* Runs on playback State Change * Runs on playback State Change
* @param attributes Music Attributes (attributes.status = current state) * @param attributes Music Attributes (attributes.status = current state)
*/ */
onPlaybackStateDidChange(attributes: object): void {} onPlaybackStateDidChange(attributes: object): void {
}
/** /**
* Runs on song change * Runs on song change
@ -86,7 +86,7 @@ export default class lastfm {
const LastfmAPI = require("lastfmapi"); const LastfmAPI = require("lastfmapi");
this._lfm = new LastfmAPI({ this._lfm = new LastfmAPI({
api_key: api.key, api_key: api.key,
secret: api.secret, secret: api.secret
}); });
if (this._utils.getStoreValue("connectivity.lastfm.secrets.username") && this._utils.getStoreValue("connectivity.lastfm.secrets.key")) { if (this._utils.getStoreValue("connectivity.lastfm.secrets.username") && this._utils.getStoreValue("connectivity.lastfm.secrets.key")) {
@ -130,12 +130,16 @@ export default class lastfm {
this._lfm.album.getInfo( this._lfm.album.getInfo(
{ {
artist: attributes.primaryArtist, artist: attributes.primaryArtist,
album: attributes.albumName, album: attributes.albumName.replace(/ - Single| - EP/g, "")
}, },
(err: any, data: any) => { (err: any, data: any) => {
if (err) { if (err) {
console.error(`[${lastfm.name}] [album.getInfo] Error: ${typeof err === "string" ? err : err.message}`); console.error(`[${lastfm.name}] [album.getInfo] Error: ${typeof err === "string" ? err : err.message}`);
return {}; attributes.lfmAlbum = {
name: attributes.albumName.replace(/ - Single| - EP/g, ""),
artist: attributes.primaryArtist,
};
callback(attributes);
} }
if (data) { if (data) {
attributes.lfmAlbum = data; attributes.lfmAlbum = data;
@ -147,7 +151,13 @@ export default class lastfm {
this._lfm.track.getCorrection(attributes.primaryArtist, attributes.name, (err: any, data: any) => { this._lfm.track.getCorrection(attributes.primaryArtist, attributes.name, (err: any, data: any) => {
if (err) { if (err) {
console.error(`[${lastfm.name}] [track.getCorrection] Error: ${typeof err === "string" ? err : err.message}`); console.error(`[${lastfm.name}] [track.getCorrection] Error: ${typeof err === "string" ? err : err.message}`);
return {}; attributes.lfmTrack = {
name: attributes.name,
artist: {
name: attributes.primaryArtist
}
}
callback(attributes);
} }
if (data) { if (data) {
attributes.lfmTrack = data.correction.track; attributes.lfmTrack = data.correction.track;
@ -186,7 +196,7 @@ export default class lastfm {
albumArtist: attributes.lfmAlbum.artist, albumArtist: attributes.lfmAlbum.artist,
timestamp: new Date().getTime() / 1000, timestamp: new Date().getTime() / 1000,
trackNumber: attributes.trackNumber, trackNumber: attributes.trackNumber,
duration: attributes.durationInMillis / 1000, duration: attributes.durationInMillis / 1000
}; };
// Easy Debugging // Easy Debugging
@ -230,7 +240,7 @@ export default class lastfm {
album: attributes.lfmAlbum.name, album: attributes.lfmAlbum.name,
trackNumber: attributes.trackNumber, trackNumber: attributes.trackNumber,
duration: attributes.durationInMillis / 1000, duration: attributes.durationInMillis / 1000,
albumArtist: attributes.lfmAlbum.artist, albumArtist: attributes.lfmAlbum.artist
}; };
this._lfm.track.updateNowPlaying(nowPlaying, (err: any, res: any) => { this._lfm.track.updateNowPlaying(nowPlaying, (err: any, res: any) => {

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

@ -57,8 +57,6 @@ export default class playbackNotifications {
</toast>`, </toast>`,
}); });
console.log(this._notification.toastXml);
this._notification.on("click", (_: any) => { this._notification.on("click", (_: any) => {
this._utils.getWindow().show(); this._utils.getWindow().show();
this._utils.getWindow().focus(); this._utils.getWindow().focus();