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

renderer side of lastfm updated

Browse source
This commit is contained in:
Core 2022-06-15 22:11:54 +01:00
parent 47e3ad5b44
commit 2827dfb36d
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
5 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/i18n/README.md
View file

@ -448,3 +448,6 @@ Update 10/06/2022 20:00 UTC
* `settings.option.visual.purplePodcastPlaybackBar`: Added to `en_US`
Update 15/06/2022 20:00 UTC
* `settings.notyf.connectivity.lastfmScrobble.connectError`: Added to `en_US`

1
src/i18n/en_US.json
View file

@ -539,6 +539,7 @@
"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.filterLoop": "Filter looped track (Last.fm)",
"settings.notyf.connectivity.lastfmScrobble.connectError": "Last.fm Connection Timed Out",
"settings.header.debug": "Debug",
"settings.option.debug.copy_log": "Copy logs to clipboard",
"settings.option.debug.openAppData": "Open Cider Folder",

1
src/i18n/source/en_US.json
View file

@ -527,6 +527,7 @@
"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.filterLoop": "Filter looped track (Last.fm)",
"settings.notyf.connectivity.lastfmScrobble.connectError": "Last.fm Connection Timed Out",
"settings.header.debug": "Debug",
"settings.option.debug.copy_log": "Copy logs to clipboard",
"settings.option.debug.openAppData": "Open Cider Folder",

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

@ -52,6 +52,15 @@ export default class lastfm {
// console.debug('lastfm:auth', event, token)
this.authenticateLastFM(token)
})
this._utils.getIPCMain().on('lastfm:disconnect', (event: any) => {
this._lfm.setSessionCredentials(null, null);
this._authenticated = false;
this._utils.setStoreValue('lastfm.enabled', false)
this._utils.setStoreValue('lastfm.secrets.username', "")
this._utils.setStoreValue('lastfm.secrets.key', "")
console.debug('[lastfm] [disconnect] Disconnected')
})
}
/**
@ -110,10 +119,11 @@ export default class lastfm {
console.error(err);
return;
}
this._utils.setStoreValue("lastfm.secrets.token", token)
this._utils.setStoreValue('lastfm.secrets.username', session.username);
this._utils.setStoreValue('lastfm.secrets.key', session.key);
this._utils.setStoreValue('lastfm.enabled', true)
this._authenticated = true;
console.debug(`[${lastfm.name}] [authenticate] Authenticated as ${session.username}`)
});
}

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

@ -1063,8 +1063,11 @@
{{$root.getLz('settings.option.connectivity.lastfmScrobble')}}
</div>
<div class="md-option-segment md-option-segment_auto">
<button class="md-btn" id="lfmConnect" ref="lfmConnect"
@click="lfmAuthorize">
<button v-if="app.cfg.lastfm.secrets.username" class="md-btn" @click="lfmDisconnect">
{{$root.getLz('term.disconnect')}}<br>
<small>{{$root.getLz('term.authed')}}: {{app.cfg.lastfm.secrets.username}}</small>
</button>
<button v-else class="md-btn" @click="lfmAuthorize">
{{$root.getLz('term.connect')}}
</button>
</div>
@ -1346,14 +1349,6 @@
this.canChangeHash = true
}
})
if (app.cfg.lastfm.enabled) {
const element = document.getElementById('lfmConnect');
if (element) {
element.innerHTML = `Disconnect\n<p style="font-size: 8px"><i>(Authed: ${app.cfg.lastfm.auth_token})</i></p>`;
element.onclick = app.LastFMDeauthorize;
}
}
},
methods: {
windowBgStyleChange() {
@ -1474,14 +1469,10 @@
reloadDiscordRPC() {
ipcRenderer.send('reloadRPC')
},
lfmDisconnect(event) {
ipcRenderer.invoke('setStoreValue', 'lastfm.enabled', false).catch((e) => console.error(e));
ipcRenderer.invoke('setStoreValue', 'lastfm.secrets.session', {}).catch((e) => console.error(e));
event.target.innerHTML = app.getLz('term.connect');
event.target.onclick = this.lfmAuthorize;
lfmDisconnect() {
ipcRenderer.send('lastfm:disconnect');
},
async lfmAuthorize(event) {
console.debug("[lastfm:authorize] Token received.")
window.open(await ipcRenderer.invoke('lastfm:url'));
event.target.innerText = app.getLz('term.connecting') + '...';
@ -1489,15 +1480,11 @@
setTimeout(() => {
if (event.target.innerText === app.getLz('term.connecting') + '...') {
event.target.innerText = app.getLz('term.connect');
app.notyf.error(app.getLz('settings.notyf.connectivity.lastfmScrobble.connectError'));
console.warn('[lastfm:authorize] Last.fm authorization timed out.');
}
}, 20000);
ipcRenderer.on('lastfm:renderer-auth', function (event, session) {
element.innerHTML = `${app.getLz('term.disconnect')}\n<p style="font-size: 8px"><i>(${app.getLz('term.authed')}: ${session.username})</i></p>`;
element.onclick = this.lfmDisconnect;
});
},
}
})