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

filter loop fixes

Browse source
This commit is contained in:
Core 2022-06-16 16:14:53 +01:00
parent 7850493c9e
commit 742e606c09
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,11 @@ export default class lastfm {
this._authenticated = false;
console.debug('[lastfm] [disconnect] Disconnected')
})
this._utils.getIPCMain().on('lastfm:nowPlayingChange', (event: any, attributes: any) => {
if (this._utils.getStoreValue("lastfm.filter_loop")) return;
this.onNowPlayingItemDidChange(attributes)
})
}
/**
@ -123,15 +128,18 @@ export default class lastfm {
* @private
*/
private verifyTrack(attributes: any): object {
if (!attributes) return {};
if (!attributes) return attributes;
if (!attributes.lfmAlbum) {
console.log(attributes.artistName)
console.log(attributes.albumName)
return this._lfm.album.getInfo({
"artist": attributes.artistName,
"album": attributes.albumName
}, (err: any, data: any) => {
if (err) {
console.error(`[${lastfm.name}] [album.getInfo] Error: ${err}`)
console.error(`[${lastfm.name}] [album.getInfo] Error: ${typeof err === "string" ? err : err.message}`)
console.error(err)
return {};
}
if (data) {
@ -142,7 +150,7 @@ export default class lastfm {
} else {
return this._lfm.track.getCorrection(attributes.artistName, attributes.name, (err: any, data: any) => {
if (err) {
console.error(`[${lastfm.name}] [track.getCorrection] Error: ${err}`)
console.error(`[${lastfm.name}] [track.getCorrection] Error: ${typeof err === "string" ? err : err.message}`)
console.error(err)
return {};
}

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

@ -29,6 +29,8 @@ const MusicKitInterop = {
global.ipcRenderer.send('nowPlayingItemDidChange', attributes);
}
global.ipcRenderer.send('lastfm:nowPlayingChange', attributes);
if (MusicKit.getInstance().nowPlayingItem) {
await this.sleep(750);
MusicKit.getInstance().playbackRate = app.cfg.audio.playbackRate;

2
src/renderer/views/pages/settings.ejs
View file

@ -1081,7 +1081,7 @@
</div>
<div class="md-option-line" v-show="app.cfg.lastfm.enabled">
<div class="md-option-segment">
{{$root.getLz('settings.option.connectivity.filterLoop')}}
{{$root.getLz('settings.option.connectivity.lastfmScrobble.filterLoop')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<label>