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

Moving tracks to index; Discover with URI properties; Get simple artist objects by default - speed improvements

Browse Source
This commit is contained in:
James Barnsley
2017-06-02 16:16:48 +12:00
parent 7782fa572c
commit bc1d173ab2
6 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/js/services/spotify/actions.js
View File

@ -796,26 +796,33 @@ export function getGenres(){
* Get a single artist
*
* @param uri string
* @param full boolean (whether we want a full artist object)
**/
export function getArtist( uri ){
export function getArtist(uri, full = false){
return (dispatch, getState) => {
var artist = {};
// get both the artist and the top tracks
$.when(
// Start with an empty object
// As each requests completes, they'll add to this object
var artist = {}
// We need our artist, obviously
var requests = [
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) )
.then( response => {
Object.assign(artist, response);
})
]
// Do we want a full artist, with all supporting material?
if (full){
requests.push(
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().spotify.country )
.then( response => {
Object.assign(artist, response);
}),
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().spotify.country )
.then( response => {
Object.assign(artist, response);
}),
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/related-artists' )
})
)
requests.push(
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/related-artists' )
.then( response => {
dispatch({
type: 'ARTISTS_LOADED',
@ -823,8 +830,11 @@ export function getArtist( uri ){
});
Object.assign(artist, { related_artists_uris: helpers.asURIs(response.artists) });
})
)
}
).then(() => {
// Run our requests
$.when.apply($, requests).then(() => {
if (artist.musicbrainz_id){
dispatch(lastfmActions.getArtist(artist.uri, false, artist.musicbrainz_id))
@ -836,18 +846,20 @@ export function getArtist( uri ){
type: 'ARTIST_LOADED',
key: artist.uri,
artist: artist
});
})
// now go get our artist albums
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/albums?market='+getState().spotify.country )
// Now go get our artist albums
if (full){
sendRequest( dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/albums?market='+getState().spotify.country )
.then( response => {
dispatch({
type: 'SPOTIFY_ARTIST_ALBUMS_LOADED',
data: response,
key: uri
});
})
})
});
}
})
}
}

4
src/js/services/ui/reducer.js
View File

@ -410,7 +410,7 @@ export default function reducer(ui = {}, action){
**/
case 'TRACK_LOADED':
var tracks = Object.assign([], ui.tracks)
var tracks = Object.assign({}, ui.tracks)
if (tracks[action.key]){
var track = Object.assign({}, tracks[action.key], action.track)
@ -422,7 +422,7 @@ export default function reducer(ui = {}, action){
return Object.assign({}, ui, { tracks: tracks });
case 'TRACKS_LOADED':
var tracks = Object.assign([], ui.tracks)
var tracks = Object.assign({}, ui.tracks)
for (var i = 0; i < action.tracks.length; i++){
var track = action.tracks[i]