From 0c7db5f994d90d128b1f1c970ab002a84e190404 Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Fri, 14 Feb 2020 10:34:26 +1300 Subject: [PATCH] Removing LastFM fetcher in favor of MopidyLocal, fixes #496. LastFM album images will still be loaded by GridItem on-demand --- src/js/services/mopidy/middleware.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js index a6a772fe..6139bde7 100755 --- a/src/js/services/mopidy/middleware.js +++ b/src/js/services/mopidy/middleware.js @@ -1907,7 +1907,6 @@ const MopidyMiddleware = (function () { } const album = { - source: 'local', artists_uris, tracks_uris, @@ -1919,6 +1918,7 @@ const MopidyMiddleware = (function () { } } + store.dispatch(mopidyActions.getImages('albums', helpers.arrayOf('uri', albums_loaded))); store.dispatch(coreActions.albumsLoaded(albums_loaded)); store.dispatch(coreActions.artistsLoaded(artists_loaded)); store.dispatch(coreActions.tracksLoaded(tracks_loaded)); @@ -1952,7 +1952,6 @@ const MopidyMiddleware = (function () { } const album = { - ...response[0].album, source: 'local', artists_uris: helpers.arrayOf('uri', artists), @@ -1963,14 +1962,9 @@ const MopidyMiddleware = (function () { store.dispatch(coreActions.albumLoaded(album)); store.dispatch(coreActions.artistsLoaded(artists)); - // load artwork from LastFM + // Load images if (!response[0].album.images) { - const mbid = helpers.getFromUri('mbid', album.uri); - if (mbid) { - store.dispatch(lastfmActions.getAlbum(album.uri, false, false, mbid)); - } else if (artists && artists.length > 0) { - store.dispatch(lastfmActions.getAlbum(album.uri, artists[0].name, album.name)); - } + store.dispatch(mopidyActions.getImages('albums', [album.uri])); } request(socket, store, 'library.lookup', { uris: album.tracks_uris })