secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Loading partial artists

Browse Source
This commit is contained in:
James Barnsley
2018-02-20 16:59:32 +13:00
parent 79c2eac3d1
commit 8603ada14c
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/services/lastfm/actions.js
View File

@ -224,11 +224,13 @@ export function getTrack(uri){
} }
export function getArtist(uri, artist, mbid = false){ export function getArtist(uri, artist, mbid = false){
return (dispatch, getState) => { return (dispatch, getState) => {
if (mbid){ if (mbid){
var params = 'method=artist.getInfo&mbid='+mbid var params = 'method=artist.getInfo&mbid='+mbid
} else { } else {
artist = encodeURIComponent(artist ); artist = artist.replace("&","and");
artist = encodeURIComponent(artist);
var params = 'method=artist.getInfo&artist='+artist var params = 'method=artist.getInfo&artist='+artist
} }
sendRequest(dispatch, getState, params) sendRequest(dispatch, getState, params)

11
src/js/services/mopidy/middleware.js
View File

@ -1684,7 +1684,7 @@ const MopidyMiddleware = (function(){
if (artist.musicbrainz_id){ if (artist.musicbrainz_id){
store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) ) store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) )
} else { } else {
store.dispatch(lastfmActions.getArtist(artist.uri, artist.name.replace('&','and') ) ) store.dispatch(lastfmActions.getArtist(artist.uri, artist.name))
} }
} }
}) })
@ -1708,8 +1708,13 @@ const MopidyMiddleware = (function(){
); );
artists.push(artist); artists.push(artist);
if (!artist.images){ // load artwork from LastFM
store.dispatch(lastfmActions.getArtist(artist.uri, artist.name)); if (!artist.images || artist.images.length <= 0){
if (artist.musicbrainz_id){
store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) )
} else {
store.dispatch(lastfmActions.getArtist(artist.uri, artist.name))
}
} }
} }
} }