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

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
vapormusic 2022-01-11 10:37:50 +07:00
commit ea79110c50
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.js
View file

@ -66,7 +66,7 @@ const configDefaults = {
}, },
"lastfm": { "lastfm": {
"enabled": false, "enabled": false,
"scrobble_after": 30, "scrobble_after": 50,
"auth_token": "", "auth_token": "",
"enabledRemoveFeaturingArtists": true, "enabledRemoveFeaturingArtists": true,
"NowPlaying": "true" "NowPlaying": "true"

2
src/main/lastfm.js
View file

@ -61,7 +61,7 @@ const lfm = {
}, },
scrobbleSong: async function (attributes) { scrobbleSong: async function (attributes) {
await new Promise(resolve => setTimeout(resolve, app.cfg.get('lastfm.scrobble_after') * 1000)); await new Promise(resolve => setTimeout(resolve, (attributes.durationInMillis / (app.cfg.get('lastfm.scrobble_after') / 100))));
const currentAttributes = app.media; const currentAttributes = app.media;
if (!app.lastfm || app.lastfm.cachedAttributes === attributes ) { if (!app.lastfm || app.lastfm.cachedAttributes === attributes ) {

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

@ -454,10 +454,10 @@
</div> </div>
<div class="md-option-line" v-show ="app.cfg.lastfm.enabled"> <div class="md-option-line" v-show ="app.cfg.lastfm.enabled">
<div class="md-option-segment"> <div class="md-option-segment">
LastFM Scrobble Delay LastFM Scrobble Delay (%)
</div> </div>
<div class="md-option-segment md-option-segment_auto" > <div class="md-option-segment md-option-segment_auto" >
<input type="number" v-model="app.cfg.lastfm.scrobble_after"/> <input type="number" min="50" max="100" v-model="app.cfg.lastfm.scrobble_after"/>
</div> </div>
</div> </div>
<div class="md-option-line" v-show ="app.cfg.lastfm.enabled"> <div class="md-option-line" v-show ="app.cfg.lastfm.enabled">