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

Moving tracks into 'items' database; in_library now pre-populated; Next to add/remove from library

Browse Source
This commit is contained in:
James Barnsley
2020-09-11 22:13:06 +12:00
parent 5953fc84cf
commit f254170b2f
23 changed files with 297 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -315,6 +315,7 @@ const CoreMiddleware = (function () {
* */
case 'LOAD_ITEMS':
action.uris.forEach((uri) => {
store.dispatch(uiActions.startLoading(uri, `load_item_${uri}`));
store.dispatch({
type: `LOAD_${uriType(uri).toUpperCase()}`,
uri,
@ -574,11 +575,12 @@ const CoreMiddleware = (function () {
break;
case 'LOAD_LIBRARY':
store.dispatch(uiActions.startLoading(action.uri, `load_library_${action.uri}`));
const fetchLibrary = () => {
switch (uriSource(action.uri)) {
case 'spotify':
store.dispatch(
spotifyActions[`getLibrary${titleCase(uriType(action.uri))}`](action.forceRefetch),
spotifyActions[`getLibrary${titleCase(uriType(action.uri))}`](action.options.forceRefetch),
);
break;
case 'google':
@ -730,10 +732,14 @@ const CoreMiddleware = (function () {
break;
case 'ITEMS_LOADED':
const mergedItems = action.items.map((item) => ({
...core.items[item.uri] || {},
...item,
}));
const mergedItems = [];
action.items.forEach((item) => {
mergedItems.push({
...core.items[item.uri] || {},
...item,
});
store.dispatch(uiActions.stopLoading(item.uri));
});
store.dispatch(coreActions.updateColdStore(mergedItems));
next({
...action,
@ -742,10 +748,21 @@ const CoreMiddleware = (function () {
break;
case 'LIBRARY_LOADED':
store.dispatch(uiActions.stopLoading(action.library.uri));
store.dispatch(coreActions.updateColdStore([action.library]));
next(action);
break;
case 'RESTORE_ITEMS_FROM_COLD_STORE':
action.items.forEach((item) => store.dispatch(uiActions.stopLoading(item.uri)));
next(action);
break;
case 'RESTORE_LIBRARY_FROM_COLD_STORE':
store.dispatch(uiActions.stopLoading(action.library.uri));
next(action);
break;
case 'ARTISTS_LOADED':
var artists_index = { ...core.artists };
var artists_loaded = [];