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

Upgrade responses

Browse Source
This commit is contained in:
James Barnsley
2017-01-10 16:51:08 +13:00
parent 15a9da0369
commit 93aaffdac5
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy_iris/pusher.py
View File

@ -267,18 +267,15 @@ class PusherWebsocketHandler(tornado.websocket.WebSocketHandler):
)
# get system version and check for upgrade
elif messageJson['action'] == 'perform_upgrade':
elif messageJson['action'] == 'upgrade':
version = self.frontend.get_version()
version['upgrade_successful'] = self.frontend.perform_upgrade()
upgrade_successful = self.frontend.perform_upgrade()
send_message(
self.connectionid,
'response',
messageJson['request_id'],
{ 'version': version }
{ 'upgrade_successful': upgrade_successful, 'version': version }
)
# notify all clients of this change
broadcast( 'upgraded', { 'version': version })
# restart mopidy
elif messageJson['action'] == 'restart':

12
src/js/services/pusher/middleware.js
View File

@ -22,6 +22,8 @@ const PusherMiddleware = (function(){
// handle all manner of socket messages
const handleMessage = (ws, store, message) => {
//console.log('handleMessage', message)
switch (message.action){
case 'response':
if (typeof( deferredRequests[ message.request_id ]) !== 'undefined' ){
@ -127,13 +129,13 @@ const PusherMiddleware = (function(){
break;
case 'START_UPGRADE':
request({ action: 'perform_upgrade' })
request({ action: 'upgrade' })
.then(
response => {
if (response.data.version.upgrade_successful){
uiActions.createNotification('Upgrade complete')
if (response.data.upgrade_successful){
store.dispatch( uiActions.createNotification('Upgrade complete') )
}else{
uiActions.createNotification('Upgrade failed, manual upgrade required')
store.dispatch( uiActions.createNotification('Upgrade failed, please upgrade manually','bad') )
}
store.dispatch({ type: 'VERSION', data: response.data })
}
@ -180,7 +182,7 @@ const PusherMiddleware = (function(){
})
.then(
response => {
uiActions.createNotification('Authorization sent')
store.dispatch( uiActions.createNotification('Authorization sent') )
}
)
break;