Snapcast groups revamp

This commit is contained in:
James Barnsley
2019-11-05 16:05:49 +13:00
parent 6e70c364d7
commit 9190950f56
18 changed files with 1402 additions and 1195 deletions

View File

@ -224,7 +224,7 @@ const MopidyMiddleware = (function () {
switch (action.type) {
case 'MOPIDY_CONNECT':
if (socket != null) {
socket.close();
socket.close();
}
store.dispatch({ type: 'MOPIDY_CONNECTING' });
@ -240,10 +240,12 @@ const MopidyMiddleware = (function () {
case 'MOPIDY_CONNECTED':
if (store.getState().ui.allow_reporting) {
const hashed_hostname = sha256(window.location.hostname);
ReactGA.event({ category: 'Mopidy', action: 'Connected', label: hashed_hostname });
}
store.dispatch(uiActions.createNotification({ content: 'Mopidy connected' }));
ReactGA.event({
category: 'Mopidy',
action: 'Connected',
label: sha256(window.location.hostname),
});
}
next(action);
break;
@ -254,7 +256,6 @@ const MopidyMiddleware = (function () {
break;
case 'MOPIDY_DISCONNECTED':
store.dispatch(uiActions.createNotification({ type: 'bad', content: 'Mopidy disconnected' }));
helpers.setFavicon('favicon_error.png');
break;
@ -265,6 +266,19 @@ const MopidyMiddleware = (function () {
});
break;
case 'MOPIDY_SET_CONNECTION':
store.dispatch(mopidyActions.set(action.data));
// Wait 250 ms and then retry connection
setTimeout(
() => {
store.dispatch(mopidyActions.connect());
store.dispatch(pusherActions.connect());
},
250,
);
break;
case 'SET_WINDOW_FOCUS':
// Focus has just been regained
@ -284,21 +298,21 @@ const MopidyMiddleware = (function () {
request(socket, store, action.method, action.params)
.then(
(response) => {
if (action.response_callback) {
store.dispatch(action.response_callback.call(this, response));
}
if (action.response_callback) {
store.dispatch(action.response_callback.call(this, response));
}
},
(error) => {
if (action.error_callback) {
store.dispatch(action.error_callback.call(this, error));
} else {
store.dispatch(coreActions.handleException(
'Mopidy request failed',
error,
action.method,
action,
));
}
if (action.error_callback) {
store.dispatch(action.error_callback.call(this, error));
} else {
store.dispatch(coreActions.handleException(
'Mopidy request failed',
error,
action.method,
action,
));
}
},
);
break;