From 8603ada14cbbab20e3b0fabc01e92e4d5e68925f Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Tue, 20 Feb 2018 16:59:32 +1300
Subject: [PATCH] Loading partial artists

---
 src/js/services/lastfm/actions.js    |  4 +++-
 src/js/services/mopidy/middleware.js | 11 ++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/js/services/lastfm/actions.js b/src/js/services/lastfm/actions.js
index 9e1c8f5c..5965acc3 100755
--- a/src/js/services/lastfm/actions.js
+++ b/src/js/services/lastfm/actions.js
@@ -224,11 +224,13 @@ export function getTrack(uri){
 }
 
 export function getArtist(uri, artist, mbid = false){
+
     return (dispatch, getState) => {
         if (mbid){
             var params = 'method=artist.getInfo&mbid='+mbid
         } else {
-            artist = encodeURIComponent(artist );
+            artist = artist.replace("&","and");
+            artist = encodeURIComponent(artist);
             var params = 'method=artist.getInfo&artist='+artist
         }
         sendRequest(dispatch, getState, params)
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 4ea958cd..44589ed6 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -1684,7 +1684,7 @@ const MopidyMiddleware = (function(){
                             if (artist.musicbrainz_id){
                                 store.dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id ) )
                             } 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);
 
-                                if (!artist.images){
-                                    store.dispatch(lastfmActions.getArtist(artist.uri, artist.name));
+                                // load artwork from LastFM
+                                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))
+                                    }
                                 }
                             }
                         }