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

Universal loadedMore for lazy-loading assets

Browse Source
This commit is contained in:
James Barnsley
2017-11-09 21:04:45 +13:00
parent 891dc2af7a
commit e2dbbac98b
7 changed files with 136 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/services/core/actions.js
View File

@ -221,6 +221,16 @@ export function getLibraryArtists(){
* Assets loaded
**/
export function loadedMore(parent_type, parent_key, records_type, records_data){
return {
type: 'LOADED_MORE',
parent_type: parent_type,
parent_key: parent_key,
records_type: records_type,
records_data: records_data
}
}
export function tracksLoaded(tracks){
return {
type: 'TRACKS_LOADED',

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

@ -220,7 +220,6 @@ const CoreMiddleware = (function(){
break;
case 'MOPIDY_TLTRACKS':
var core = store.getState().core;
var tracklist = []
for (var i = 0; i < action.data.length; i++){
@ -484,19 +483,7 @@ const CoreMiddleware = (function(){
}
if (playlists[playlist.uri] !== undefined){
var existing_playlist = playlists[playlist.uri];
if (existing_playlist.tracks && playlist.tracks){
var tracks = [...existing_playlist.tracks, ...playlist.tracks];
} else if (existing_playlist.tracks){
var tracks = existing_playlist.tracks;
} else if (playlist.tracks){
var tracks = playlist.tracks;
} else {
var tracks = [];
}
playlist = Object.assign({tracks: tracks}, existing_playlist, playlist);
playlist = Object.assign({}, playlists[playlist.uri], playlist);
}
// Load our tracks
@ -527,7 +514,7 @@ const CoreMiddleware = (function(){
break;
case 'USERS_LOADED':
var users = Object.assign([], core.users);
var users = Object.assign({}, core.users);
for (var i = 0; i < action.users.length; i++){
var user = Object.assign({}, action.users[i]);
@ -548,6 +535,63 @@ const CoreMiddleware = (function(){
next(action);
break;
/**
* Loaded more linked assets
* Often fired during lazy-loading or async asset grabbing.
* We link the parent to these indexed records by {type}s_uris
**/
case 'LOADED_MORE':
var parent_type_plural = action.parent_type+'s';
var parent_index = Object.assign({}, core[action.parent_type+'s']);
var parent = Object.assign({}, parent_index[action.parent_key]);
if (action.records_data.items !== undefined){
var records = action.records_data.items;
} else if (action.records_data.tracks !== undefined){
var records = action.records_data.tracks;
} else if (action.records_data.artists !== undefined){
var records = action.records_data.artists;
} else if (action.records_data.albums !== undefined){
var records = action.records_data.albums;
} else if (action.records_data.playlists !== undefined){
var records = action.records_data.playlists;
} else {
var records = action.records_data;
}
if (action.records_type == 'track'){
records = helpers.formatTracks(records);
}
var records_type_plural = action.records_type+'s';
var records_index = Object.assign({});
var records_uris = helpers.arrayOf('uri', records);
// Append our records_uris array with our new records
var uris = [...parent[records_type_plural+'_uris'], ...records_uris];
parent[records_type_plural+'_uris'] = uris;
if (action.records_data.next !== undefined){
parent[records_type_plural+'_more'] = action.records_data.next;
}
// Parent loaded (well, changed)
var parent_action = {
type: parent_type_plural.toUpperCase()+'_LOADED'
};
parent_action[parent_type_plural] = [parent];
store.dispatch(parent_action);
// Records loaded
var records_action = {
type: records_type_plural.toUpperCase()+'_LOADED'
};
records_action[records_type_plural] = records;
store.dispatch(records_action);
next(action);
break;
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action)