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

Consistent asset structure

Browse Source
This commit is contained in:
James Barnsley
2018-08-29 21:13:54 +12:00
parent 56e975898f
commit 0e32361c7e
9 changed files with 10922 additions and 13912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/js/services/core/middleware.js
View File

@ -457,26 +457,28 @@ const CoreMiddleware = (function(){
case 'ALBUMS_LOADED':
var albums_index = Object.assign({}, core.albums);
var albums_loaded = [];
var artists_loaded = [];
var tracks_loaded = [];
action.albums.forEach(album => {
helpers.formatAlbum(album)
action.albums.forEach(raw_album => {
var album = helpers.formatAlbum(raw_album);
if (albums_index[album.uri]){
album = Object.assign({}, albums_index[album.uri], album);
}
if (album.images && album.images.length > 0){
album.images = helpers.digestMopidyImages(store.getState().mopidy, album.images);
if (raw_album.images && raw_album.images.length > 0){
album.images = helpers.digestMopidyImages(store.getState().mopidy, raw_album.images);
}
// Load our tracks
if (album.tracks){
var tracks = helpers.formatTracks(album.tracks);
var tracks_uris = helpers.arrayOf('uri', tracks);
album.tracks_uris = tracks_uris;
delete album.tracks;
tracks_loaded = [...tracks_loaded, ...tracks];
if (raw_album.tracks){
album.tracks_uris = helpers.arrayOf('uri', raw_album.tracks);
tracks_loaded = [...tracks_loaded, ...raw_album.tracks];
}
if (raw_album.artists){
album.artists_uris = helpers.arrayOf('uri', raw_album.artists);
artists_loaded = [...artists_loaded, ...raw_album.artists];
}
albums_loaded.push(album);
@ -484,7 +486,11 @@ const CoreMiddleware = (function(){
action.albums = albums_loaded;
// Trigger the tracks load action
store.dispatch({
type: 'ARTISTS_LOADED',
artists: artists_loaded
});
store.dispatch({
type: 'TRACKS_LOADED',
tracks: tracks_loaded

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

@ -115,7 +115,6 @@ const SpotifyMiddleware = (function(){
break
case 'SPOTIFY_ARTIST_ALBUMS_LOADED':
console.log(action)
store.dispatch(coreActions.albumsLoaded(action.data.items));
store.dispatch({
type: 'ARTIST_ALBUMS_LOADED',