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

Attempting threading for long-runing system processes

Browse Source
This commit is contained in:
James Barnsley
2018-11-02 10:20:32 +13:00
parent b83043ef4f
commit 4c100a9527
9 changed files with 172 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/services/pusher/actions.js
View File

@ -48,6 +48,12 @@ export function restart(){
}
}
export function runLocalScan(){
return {
type: 'PUSHER_RUN_LOCAL_SCAN'
}
}
export function getConnections(){
return {
type: 'PUSHER_GET_CONNECTIONS'

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

@ -618,6 +618,11 @@ const PusherMiddleware = (function(){
);
break
/**
* Notifications and alerts
**/
case 'PUSHER_BROWSER_NOTIFICATION':
store.dispatch(uiActions.createBrowserNotification(action))
break
@ -632,6 +637,11 @@ const PusherMiddleware = (function(){
store.dispatch(uiActions.createNotification(data));
break
/**
* Server actions
**/
case 'PUSHER_RELOAD':
// Hard reload. This doesn't strictly clear the cache, but our compiler's
// cache buster should handle that
@ -666,6 +676,21 @@ const PusherMiddleware = (function(){
);
break;
case 'PUSHER_RUN_LOCAL_SCAN':
if (store.getState().ui.allow_reporting){
ReactGA.event({ category: 'Pusher', action: 'Run local scan', label: '' });
}
request(store, 'run_local_scan')
.then(
response => {
store.dispatch(mopidyActions.localScanRunning());
},
error => {
store.dispatch(uiActions.createNotification({content: error.message, description: (error.description ? error.description : null), type: 'bad'}));
}
);
break;
case 'PUSHER_VERSION':
if (store.getState().ui.allow_reporting){
ReactGA.event({ category: 'Pusher', action: 'Version', label: action.version.current });

26
src/js/views/Settings.js
View File

@ -202,7 +202,6 @@ class Settings extends React.Component {
</a>
</span>
)
if (this.props.mopidy.upgrading){
var upgrade_button = (
@ -215,6 +214,16 @@ class Settings extends React.Component {
} else {
var upgrade_button = null;
}
if (this.props.mopidy.local_scan_running){
var local_scan_button = (
<button className="working">
Running scan...
</button>
);
} else {
var local_scan_button = <button onClick={e => this.props.pusherActions.runLocalScan()}>Run local scan</button>;
}
return (
<div className="view settings-view">
@ -379,16 +388,6 @@ class Settings extends React.Component {
</div>
<h4 className="underline">Advanced<a name="advanced"></a></h4>
<div className="field button-wrapper">
<div className="name">Share configuration</div>
<div className="input">
<Link className="button" to={global.baseURL+"share-configuration"}>Share</Link>
<div className="description">
Send your authorizations and configuration to another Iris client
</div>
</div>
</div>
<div className="field">
<div className="name">Artist library URI</div>
@ -438,6 +437,11 @@ class Settings extends React.Component {
</div>
</div>
<div className="field">
{local_scan_button}
<Link className="button" to={global.baseURL+"share-configuration"}>Share configuration</Link>
</div>
<div className="field">
{upgrade_button}
<button className={"destructive"+(this.props.mopidy.restarting ? ' working' : '')} onClick={e => this.props.pusherActions.restart()}>{this.props.mopidy.restarting ? 'Restarting...' : 'Restart server'}</button>