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

Unifying loading and index updating

Browse Source
This commit is contained in:
James Barnsley
2018-08-12 20:59:00 +12:00
parent f235a1c48c
commit e1fad661e5
8 changed files with 552 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1120,10 +1120,7 @@ export function getArtist(uri, full = false){
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/related-artists' )
.then(
response => {
dispatch({
type: 'ARTISTS_LOADED',
artists: response.artists
});
dispatch(coreActions.artistsLoaded(response.artists));
Object.assign(artist, { related_artists_uris: helpers.arrayOf('uri',response.artists) });
},
error => {
@ -1145,11 +1142,7 @@ export function getArtist(uri, full = false){
dispatch(lastfmActions.getArtist(artist.uri, artist.name.replace('&','and')))
}
dispatch({
type: 'ARTIST_LOADED',
key: artist.uri,
artist: artist
})
dispatch(coreActions.artistLoaded(artist));
// Now go get our artist albums
if (full){
@ -1158,8 +1151,8 @@ export function getArtist(uri, full = false){
response => {
dispatch({
type: 'SPOTIFY_ARTIST_ALBUMS_LOADED',
data: response,
key: uri
artist_uri: uri,
data: response
})
},
error => {
@ -1578,11 +1571,7 @@ export function getPlaylist(uri){
}
)
dispatch({
type: 'PLAYLIST_LOADED',
key: playlist.uri,
playlist: playlist
})
dispatch(coreActions.playlistLoaded(playlist));
},
error => {
dispatch(coreActions.handleException(

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

@ -3,6 +3,7 @@ import ReactGA from 'react-ga';
import md5 from 'md5';
var helpers = require('./../../helpers');
var coreActions = require('../core/actions');
var spotifyActions = require('./actions');
var uiActions = require('../ui/actions');
var pusherActions = require('../pusher/actions');
@ -114,14 +115,12 @@ const SpotifyMiddleware = (function(){
break
case 'SPOTIFY_ARTIST_ALBUMS_LOADED':
store.dispatch({
type: 'ALBUMS_LOADED',
albums: action.data.items
});
console.log(action)
store.dispatch(coreActions.albumsLoaded(action.data.items));
store.dispatch({
type: 'ARTIST_ALBUMS_LOADED',
key: action.key,
uris: helpers.arrayOf('uri',action.data.items),
artist_uri: action.artist_uri,
albums_uris: helpers.arrayOf('uri',action.data.items),
more: action.data.next,
total: action.data.total
});