Properly cancellable processes; Playlists that refuse to load tracks

This commit is contained in:
James Barnsley
2020-05-25 20:50:25 +12:00
parent 487bd5590b
commit fec4396583
17 changed files with 777 additions and 779 deletions

View File

@ -208,6 +208,7 @@ const UIMiddleware = (function () {
store.dispatch({
type: `${action.key}_CANCELLED`,
});
store.dispatch(uiActions.closeProcess(action.key));
next(action);
break;

View File

@ -152,9 +152,12 @@ export default function reducer(ui = {}, action) {
case 'START_PROCESS':
case 'UPDATE_PROCESS':
var processes = { ...(ui.processes ? ui.processes : []) };
if (processes[action.key]) {
var data = { ...processes[action.key].data, ...action.data };
var processes = { ...(ui.processes || []) };
var last_run = processes[action.key];
var status = 'running';
if (last_run) {
var data = { ...last_run.data, ...action.data };
status = last_run.status;
} else {
var { data } = action;
}
@ -162,8 +165,8 @@ export default function reducer(ui = {}, action) {
key: action.key,
content: action.content,
description: action.description,
status: 'running',
level: action.level,
status,
data,
};
return { ...ui, processes };