Musicbrainz is out, Discogs is in

src/js/services/discogs/actions.js

@@ -14,13 +14,19 @@ var sendRequest = (dispatch, endpoint, params) => {
     return new Promise((resolve, reject) => {
         const loader_key = helpers.generateGuid();
 
-        dispatch(uiActions.startLoading(loader_key, ',musicbrainz_'+endpoint));
+        dispatch(uiActions.startLoading(loader_key, ',discogs_'+endpoint));
+
+        let key = 'CXIwsVMAjrXIVitBWgqd';
+        let secret = 'KiEUfwKpebxRnEHlKoXnYIftJxeuqjTK';
 
         var config = {
             method: 'GET',
             cache: true,
             timeout: 30000,
-            url: 'https://musicbrainz.org/ws/2/'+endpoint+'?fmt=json&'+params
+            url: `https://api.discogs.com/${endpoint}?key=${key}&secret=${secret}&${params}`,
+            headers: {
+                'user-agent': 'Iris/1.0',
+            },
         }
 
         $.ajax(config).then(
@@ -56,40 +62,46 @@ var sendRequest = (dispatch, endpoint, params) => {
     })
 }
 
-export function findArtist(uri, artist){
-    return (dispatch, getState) => {
-        sendRequest(dispatch, 'artist', 'query=artist:'+artist.name)
-            .then(
-                response => {
-                    console.log(response);
-                },
-                error => {
-                    console.info("Musicbrainz: No results for artist '"+artist.name+"'");
+export function findArtist(name){
+    return sendRequest(dispatch, 'artists/'+artist.mbid, 'inc=url-rels')
+        .then(
+            response => {
+                if (response){
+                    const image_relations = response.relations.filter(rel => rel.type == "image");
+                    if (image_relations) {
+                        const updated_artist = {
+                            uri: uri,
+                            images: image_relations.map(relation =>
+                                relation.url.resource.replace("File:","Special:FilePath/")
+                            ),
+                        }
+                        dispatch(coreActions.artistLoaded(updated_artist));
+                    }
                 }
-            )
-    }
+            },
+            error => {
+                console.log(`Musicbrainz: No results for ${artist.mbid}`)
+            }
+        )
 }
 
-export function getArtist(uri, artist){
-
+export function getArtistImages(uri, artist){
     return (dispatch, getState) => {
-        sendRequest(dispatch, 'artist/'+artist.mbid, 'inc=url-rels')
+        sendRequest(dispatch, 'database/search', `query=${artist.name}`)
             .then(
                 response => {
                     if (response){
-                        const image_relations = response.relations.filter(rel => (rel['target-type'] === 'image'));
-                        const images = image_relations.map(ir => ir.url.resource);
-                    	var artist = {
-                            uri: uri,
-                            images: images,
-                        };
-                        console.log(response);
-                        console.log(image_relations);
-                        dispatch(coreActions.artistLoaded(artist));
+                        if (response.results && response.results[0].cover_image) {
+                            const updated_artist = {
+                                uri: uri,
+                                images: [response.results[0].cover_image],
+                            }
+                            dispatch(coreActions.artistLoaded(updated_artist));
+                        }
                     }
                 },
                 error => {
-                    console.info("Musicbrainz: No results for artist '"+artist.uri+"'");
+                    console.log(`Discogs: No results for ${artist.name}`)
                 }
             )
     }

src/js/services/lastfm/actions.js

@@ -1,6 +1,5 @@
 
 var coreActions = require('../core/actions');
-var musicbrainzActions = require('../musicbrainz/actions');
 var uiActions = require('../ui/actions');
 var helpers = require('../../helpers');
 
@@ -253,7 +252,6 @@ export function getArtist(uri, artist, mbid = false){
                     if (response.artist){
                     	var artist = {
                             uri: uri,
-                            //images: response.artist.image,
                             mbid: response.artist.mbid,
                             biography: response.artist.bio.content,
                             biography_publish_date: response.artist.bio.published,
@@ -262,7 +260,6 @@ export function getArtist(uri, artist, mbid = false){
                         };
 
                         dispatch(coreActions.artistLoaded(artist));
-                        dispatch(musicbrainzActions.getArtist(uri, artist));
                     }
                 },
                 error => {

src/js/services/mopidy/middleware.js

@@ -12,7 +12,7 @@ var spotifyActions = require('../spotify/actions.js');
 var pusherActions = require('../pusher/actions.js');
 var googleActions = require('../google/actions.js');
 var lastfmActions = require('../lastfm/actions.js');
-var musicbrainzActions = require('../musicbrainz/actions.js');
+var discogsActions = require('../discogs/actions.js');
 
 const MopidyMiddleware = (function(){
 
@@ -2150,10 +2150,14 @@ const MopidyMiddleware = (function(){
 
                         store.dispatch(coreActions.artistLoaded(artist));
 
-                        // Load supprting information from LastFM and Musicbrainz
+                        // Load supprting information from LastFM and Discogs
                         var existing_artist = store.getState().core.artists[artist.uri];
                         if (existing_artist) {
 
+                            if (!existing_artist.images) {
+                                store.dispatch(discogsActions.getArtistImages(artist.uri, artist));
+                            }
+
                             // Get biography and other stats from LastFM
                             if (!existing_artist.biography){
                                 // TODO: Move this condition into lastfmActions

src/js/services/musicbrainz/middleware.js

@@ -1,15 +0,0 @@
-
-var helpers = require('./../../helpers');
-var musicbrainzActions = require('./actions');
-
-const MusicbrainzMiddleware = (function(){
-
-    return store => next => action => {
-        switch(action.type){
-            default:
-                return next(action);
-        }
-    }
-})();
-
-export default MusicbrainzMiddleware

src/js/services/musicbrainz/reducer.js

@@ -1,7 +0,0 @@
-
-export default function reducer(musicbrainz = {}, action){
-    switch (action.type){
-        default:
-            return lastfm
-    }
-}