Auto eslint fix

This commit is contained in:
James Barnsley
2019-09-05 15:36:11 +12:00
parent 4513a0d109
commit e4d53a2d35
126 changed files with 23283 additions and 23573 deletions

View File

@ -1,135 +1,133 @@
export function getServer(){
return {
type: 'SNAPCAST_GET_SERVER'
}
export function getServer() {
return {
type: 'SNAPCAST_GET_SERVER',
};
}
export function setClientName(id, name){
return {
type: 'SNAPCAST_SET_CLIENT_NAME',
id: id,
name: name
}
export function setClientName(id, name) {
return {
type: 'SNAPCAST_SET_CLIENT_NAME',
id,
name,
};
}
export function setClientMute(id, mute){
return {
type: 'SNAPCAST_SET_CLIENT_MUTE',
id: id,
mute: mute
}
export function setClientMute(id, mute) {
return {
type: 'SNAPCAST_SET_CLIENT_MUTE',
id,
mute,
};
}
export function setClientVolume(id, volume){
return {
type: 'SNAPCAST_SET_CLIENT_VOLUME',
id: id,
volume: volume
}
export function setClientVolume(id, volume) {
return {
type: 'SNAPCAST_SET_CLIENT_VOLUME',
id,
volume,
};
}
export function setClientLatency(id, latency){
return {
type: 'SNAPCAST_SET_CLIENT_LATENCY',
id: id,
latency: latency
}
export function setClientLatency(id, latency) {
return {
type: 'SNAPCAST_SET_CLIENT_LATENCY',
id,
latency,
};
}
export function setClientGroup(id, group_id){
return {
type: 'SNAPCAST_SET_CLIENT_GROUP',
id: id,
group_id: group_id
}
export function setClientGroup(id, group_id) {
return {
type: 'SNAPCAST_SET_CLIENT_GROUP',
id,
group_id,
};
}
export function deleteClient(id){
return {
type: 'SNAPCAST_DELETE_CLIENT',
id: id
}
export function deleteClient(id) {
return {
type: 'SNAPCAST_DELETE_CLIENT',
id,
};
}
export function setGroupStream(id, stream_id){
return {
type: 'SNAPCAST_SET_GROUP_STREAM',
id: id,
stream_id: stream_id
}
export function setGroupStream(id, stream_id) {
return {
type: 'SNAPCAST_SET_GROUP_STREAM',
id,
stream_id,
};
}
export function setGroupMute(id, mute){
return {
type: 'SNAPCAST_SET_GROUP_MUTE',
id: id,
mute: mute
}
export function setGroupMute(id, mute) {
return {
type: 'SNAPCAST_SET_GROUP_MUTE',
id,
mute,
};
}
export function setGroupVolume(id, percent, old_percent = 0){
return {
type: 'SNAPCAST_SET_GROUP_VOLUME',
id: id,
percent: percent,
old_percent: old_percent
}
export function setGroupVolume(id, percent, old_percent = 0) {
return {
type: 'SNAPCAST_SET_GROUP_VOLUME',
id,
percent,
old_percent,
};
}
export function eventReceived(message){
return {
type: 'SNAPCAST_EVENT_RECEIVED',
method: message.method,
params: message.params
}
export function eventReceived(message) {
return {
type: 'SNAPCAST_EVENT_RECEIVED',
method: message.method,
params: message.params,
};
}
/**
* Record loaders
*
* We've got a loaded record, now we just need to plug it in to our state and stores.
**/
* */
export function serverLoaded(server){
return {
type: 'SNAPCAST_SERVER_LOADED',
server: server
}
export function serverLoaded(server) {
return {
type: 'SNAPCAST_SERVER_LOADED',
server,
};
}
export function clientLoaded(client){
return clientsLoaded([client]);
export function clientLoaded(client) {
return clientsLoaded([client]);
}
export function clientsLoaded(clients, flush = false){
return {
type: 'SNAPCAST_CLIENTS_LOADED',
clients: clients,
flush: flush
}
export function clientsLoaded(clients, flush = false) {
return {
type: 'SNAPCAST_CLIENTS_LOADED',
clients,
flush,
};
}
export function groupLoaded(group){
return groupsLoaded([group]);
export function groupLoaded(group) {
return groupsLoaded([group]);
}
export function groupsLoaded(groups, flush = false){
return {
type: 'SNAPCAST_GROUPS_LOADED',
groups: groups,
flush: flush
}
export function groupsLoaded(groups, flush = false) {
return {
type: 'SNAPCAST_GROUPS_LOADED',
groups,
flush,
};
}
export function streamLoaded(stream){
return streamsLoaded([stream]);
export function streamLoaded(stream) {
return streamsLoaded([stream]);
}
export function streamsLoaded(streams, flush = false){
return {
type: 'SNAPCAST_STREAMS_LOADED',
streams: streams,
flush: flush
}
}
export function streamsLoaded(streams, flush = false) {
return {
type: 'SNAPCAST_STREAMS_LOADED',
streams,
flush,
};
}

View File

@ -1,474 +1,468 @@
import ReactGA from 'react-ga'
import ReactGA from 'react-ga';
var helpers = require('../../helpers');
var coreActions = require('../core/actions');
var uiActions = require('../ui/actions');
var pusherActions = require('../pusher/actions');
var snapcastActions = require('./actions');
const helpers = require('../../helpers');
const coreActions = require('../core/actions');
const uiActions = require('../ui/actions');
const pusherActions = require('../pusher/actions');
const snapcastActions = require('./actions');
const SnapcastMiddleware = (function(){
// A snapcast request is an alias of the Pusher request
const request = (store, params = null, response_callback = null, error_callback = null) => {
store.dispatch(
const SnapcastMiddleware = (function () {
// A snapcast request is an alias of the Pusher request
const request = (store, params = null, response_callback = null, error_callback = null) => {
store.dispatch(
pusherActions.request(
'snapcast',
params,
response_callback,
error_callback
)
);
return;
}
error_callback,
),
);
};
return store => next => action => {
var snapcast = store.getState().snapcast;
return (store) => (next) => (action) => {
const { snapcast } = store.getState();
switch(action.type){
case 'SNAPCAST_GET_SERVER':
request(
store,
switch (action.type) {
case 'SNAPCAST_GET_SERVER':
request(
store,
{
method: 'Server.GetStatus'
method: 'Server.GetStatus',
},
response => {
store.dispatch(snapcastActions.serverLoaded(response.server));
(response) => {
store.dispatch(snapcastActions.serverLoaded(response.server));
},
(error) => {
store.dispatch(coreActions.handleException(
'Could not get server',
error,
));
},
error => {
store.dispatch(coreActions.handleException(
'Could not get server',
error
));
}
);
break
break;
case 'SNAPCAST_SERVER_LOADED':
store.dispatch(snapcastActions.groupsLoaded(action.server.groups, true));
store.dispatch(snapcastActions.streamsLoaded(action.server.streams, true));
case 'SNAPCAST_SERVER_LOADED':
store.dispatch(snapcastActions.groupsLoaded(action.server.groups, true));
store.dispatch(snapcastActions.streamsLoaded(action.server.streams, true));
// Snapcast double-nests the server object
action.server = action.server.server;
// Snapcast double-nests the server object
action.server = action.server.server;
next(action);
break
next(action);
break;
case 'SNAPCAST_GROUPS_LOADED':
var groups_index = Object.assign({}, snapcast.groups);
var groups_loaded = [];
var clients_loaded = [];
case 'SNAPCAST_GROUPS_LOADED':
var groups_index = { ...snapcast.groups };
var groups_loaded = [];
var clients_loaded = [];
for (var raw_group of action.groups){
var group = helpers.formatGroup(raw_group);
for (const raw_group of action.groups) {
var group = helpers.formatGroup(raw_group);
if (groups_index[group.id]){
group = Object.assign({}, groups_index[group.id], group);
}
if (groups_index[group.id]) {
group = { ...groups_index[group.id], ...group };
}
if (raw_group.clients){
group.clients_ids = helpers.arrayOf('id', raw_group.clients);
clients_loaded = [...clients_loaded, ...raw_group.clients];
}
if (raw_group.clients) {
group.clients_ids = helpers.arrayOf('id', raw_group.clients);
clients_loaded = [...clients_loaded, ...raw_group.clients];
}
groups_loaded.push(group);
};
action.groups = groups_loaded;
if (clients_loaded.length > 0){
store.dispatch(snapcastActions.clientsLoaded(clients_loaded, action.flush));
}
next(action);
break
case 'SNAPCAST_CLIENTS_LOADED':
var clients_index = Object.assign({}, snapcast.clients);
var clients_loaded = [];
for (var raw_client of action.clients){
var client = helpers.formatClient(raw_client);
if (clients_index[client.id]){
client = Object.assign({}, clients_index[client.id], client);
}
clients_loaded.push(client);
}
action.clients = clients_loaded;
next(action);
break;
case 'SNAPCAST_SET_CLIENT_NAME':
var client = snapcast.clients[action.id];
var data = {
method: 'Client.SetName',
params: {
id: action.id,
name: action.name
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
name: response.name
}
));
}
);
break
case 'SNAPCAST_SET_CLIENT_MUTE':
var client = store.getState().snapcast.clients[action.id];
var data = {
method: 'Client.SetVolume',
params: {
id: action.id,
volume: {
muted: action.mute,
percent: client.volume,
}
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
volume: response.volume.percent,
mute: response.volume.muted
}
));
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'SNAPCAST_SET_CLIENT_VOLUME':
var client = snapcast.clients[action.id];
var data = {
method: 'Client.SetVolume',
params: {
id: action.id,
volume: {
muted: client.mute,
percent: action.volume
}
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
volume: response.volume.percent
}
));
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'SNAPCAST_SET_CLIENT_LATENCY':
var client = store.getState().snapcast.clients[action.id];
var data = {
method: 'Client.SetLatency',
params: {
id: action.id,
latency: action.latency
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
latency: response.latency
}
));
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'SNAPCAST_SET_CLIENT_GROUP':
var group = snapcast.groups[action.group_id];
var clients_ids = group.clients_ids;
var clients_ids_index = clients_ids.indexOf(action.id);
// Not in group (yet), so add it
if (clients_ids_index <= -1){
clients_ids.push(action.id);
// Already there, so remove it
} else {
clients_ids.splice(clients_ids_index, 1);
}
var data = {
method: 'Group.SetClients',
params: {
id: action.group_id,
clients: clients_ids
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.serverLoaded(response.server));
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'SNAPCAST_DELETE_CLIENT':
var data = {
method: 'Server.DeleteClient',
params: {
id: action.id
}
}
request(
store,
data,
response => {
store.dispatch({
type: 'SNAPCAST_CLIENT_REMOVED',
key: action.data.params.id
})
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'SNAPCAST_SET_GROUP_STREAM':
var group = store.getState().snapcast.groups[action.id];
var data = {
method: 'Group.SetStream',
params: {
id: action.id,
stream_id: action.stream_id
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.groupLoaded(
{
id: action.id,
stream_id: action.stream_id
}
));
},
error => {
store.dispatch(coreActions.handleException(
'Could not change stream',
error,
error.message
));
}
);
break
case 'SNAPCAST_SET_GROUP_MUTE':
var group = store.getState().snapcast.groups[action.id];
var data = {
method: 'Group.SetMute',
params: {
id: action.id,
mute: action.mute
}
}
request(
store,
data,
response => {
store.dispatch(snapcastActions.groupLoaded(
{
id: action.id,
muted: response.mute
}
));
},
error => {
store.dispatch(coreActions.handleException(
'Could not toggle mute',
error,
error.message
));
}
);
break;
case 'SNAPCAST_SET_GROUP_VOLUME':
var clients_to_update = [];
var group = snapcast.groups[action.id];
var change = action.percent - action.old_percent;
for (var client_id of group.clients_ids){
// Apply the change proportionately to each client
var client = snapcast.clients[client_id];
var current_volume = client.volume;
var new_volume = current_volume + change;
// Only change if the client is within min/max limits
if ((change > 0 && current_volume < 100) || (change < 0 && current_volume > 0)){
clients_to_update.push({
id: client.id,
volume: new_volume
});
}
}
// Loop our required changes, and post each to Snapcast
for (var client_to_update of clients_to_update){
var volume = client_to_update.volume + ((group.clients_ids.length - clients_to_update.length) * change);
// Make sure we're not creating an impossible percent
if (volume < 0){
volume = 0;
} else if (volume > 100){
volume = 100;
}
store.dispatch(snapcastActions.setClientVolume(client_to_update.id, volume));
}
break;
case 'SNAPCAST_EVENT_RECEIVED':
// Drop the prefix
action.method = action.method.replace('snapcast_','');
switch (action.method){
case 'Client.OnConnect':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.client.id,
name: action.params.client.name,
volume: action.params.client.volume.percent,
mute: action.params.client.volume.muted,
connected: action.params.client.connected
}
));
break;
case 'Client.OnDisconnect':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.client.id,
connected: action.params.client.connected
}
));
break;
case 'Client.OnVolumeChanged':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.id,
mute: action.params.volume.muted,
volume: action.params.volume.percent
}
));
break;
case 'Client.OnLatencyChanged':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.id,
latency: action.params.latency
}
));
break;
case 'Client.OnNameChanged':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.id,
name: action.params.name
}
));
break;
case 'Group.OnMute':
store.dispatch(snapcastActions.groupLoaded(
{
id: action.params.id,
mute: action.params.mute
}
));
break;
case 'Server.OnUpdate':
store.dispatch(snapcastActions.serverLoaded(action.params));
break;
}
break;
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action);
groups_loaded.push(group);
}
action.groups = groups_loaded;
if (clients_loaded.length > 0) {
store.dispatch(snapcastActions.clientsLoaded(clients_loaded, action.flush));
}
next(action);
break;
case 'SNAPCAST_CLIENTS_LOADED':
var clients_index = { ...snapcast.clients };
var clients_loaded = [];
for (const raw_client of action.clients) {
var client = helpers.formatClient(raw_client);
if (clients_index[client.id]) {
client = { ...clients_index[client.id], ...client };
}
clients_loaded.push(client);
}
action.clients = clients_loaded;
next(action);
break;
case 'SNAPCAST_SET_CLIENT_NAME':
var client = snapcast.clients[action.id];
var data = {
method: 'Client.SetName',
params: {
id: action.id,
name: action.name,
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
name: response.name,
},
));
},
);
break;
case 'SNAPCAST_SET_CLIENT_MUTE':
var client = store.getState().snapcast.clients[action.id];
var data = {
method: 'Client.SetVolume',
params: {
id: action.id,
volume: {
muted: action.mute,
percent: client.volume,
},
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
volume: response.volume.percent,
mute: response.volume.muted,
},
));
},
(error) => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_SET_CLIENT_VOLUME':
var client = snapcast.clients[action.id];
var data = {
method: 'Client.SetVolume',
params: {
id: action.id,
volume: {
muted: client.mute,
percent: action.volume,
},
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
volume: response.volume.percent,
},
));
},
(error) => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_SET_CLIENT_LATENCY':
var client = store.getState().snapcast.clients[action.id];
var data = {
method: 'Client.SetLatency',
params: {
id: action.id,
latency: action.latency,
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.clientLoaded(
{
id: action.id,
latency: response.latency,
},
));
},
(error) => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_SET_CLIENT_GROUP':
var group = snapcast.groups[action.group_id];
var { clients_ids } = group;
var clients_ids_index = clients_ids.indexOf(action.id);
// Not in group (yet), so add it
if (clients_ids_index <= -1) {
clients_ids.push(action.id);
// Already there, so remove it
} else {
clients_ids.splice(clients_ids_index, 1);
}
var data = {
method: 'Group.SetClients',
params: {
id: action.group_id,
clients: clients_ids,
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.serverLoaded(response.server));
},
(error) => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_DELETE_CLIENT':
var data = {
method: 'Server.DeleteClient',
params: {
id: action.id,
},
};
request(
store,
data,
(response) => {
store.dispatch({
type: 'SNAPCAST_CLIENT_REMOVED',
key: action.data.params.id,
});
},
(error) => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_SET_GROUP_STREAM':
var group = store.getState().snapcast.groups[action.id];
var data = {
method: 'Group.SetStream',
params: {
id: action.id,
stream_id: action.stream_id,
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.groupLoaded(
{
id: action.id,
stream_id: action.stream_id,
},
));
},
(error) => {
store.dispatch(coreActions.handleException(
'Could not change stream',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_SET_GROUP_MUTE':
var group = store.getState().snapcast.groups[action.id];
var data = {
method: 'Group.SetMute',
params: {
id: action.id,
mute: action.mute,
},
};
request(
store,
data,
(response) => {
store.dispatch(snapcastActions.groupLoaded(
{
id: action.id,
muted: response.mute,
},
));
},
(error) => {
store.dispatch(coreActions.handleException(
'Could not toggle mute',
error,
error.message,
));
},
);
break;
case 'SNAPCAST_SET_GROUP_VOLUME':
var clients_to_update = [];
var group = snapcast.groups[action.id];
var change = action.percent - action.old_percent;
for (const client_id of group.clients_ids) {
// Apply the change proportionately to each client
var client = snapcast.clients[client_id];
const current_volume = client.volume;
const new_volume = current_volume + change;
// Only change if the client is within min/max limits
if ((change > 0 && current_volume < 100) || (change < 0 && current_volume > 0)) {
clients_to_update.push({
id: client.id,
volume: new_volume,
});
}
}
// Loop our required changes, and post each to Snapcast
for (const client_to_update of clients_to_update) {
let volume = client_to_update.volume + ((group.clients_ids.length - clients_to_update.length) * change);
// Make sure we're not creating an impossible percent
if (volume < 0) {
volume = 0;
} else if (volume > 100) {
volume = 100;
}
store.dispatch(snapcastActions.setClientVolume(client_to_update.id, volume));
}
break;
case 'SNAPCAST_EVENT_RECEIVED':
// Drop the prefix
action.method = action.method.replace('snapcast_', '');
switch (action.method) {
case 'Client.OnConnect':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.client.id,
name: action.params.client.name,
volume: action.params.client.volume.percent,
mute: action.params.client.volume.muted,
connected: action.params.client.connected,
},
));
break;
case 'Client.OnDisconnect':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.client.id,
connected: action.params.client.connected,
},
));
break;
case 'Client.OnVolumeChanged':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.id,
mute: action.params.volume.muted,
volume: action.params.volume.percent,
},
));
break;
case 'Client.OnLatencyChanged':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.id,
latency: action.params.latency,
},
));
break;
case 'Client.OnNameChanged':
store.dispatch(snapcastActions.clientLoaded(
{
id: action.params.id,
name: action.params.name,
},
));
break;
case 'Group.OnMute':
store.dispatch(snapcastActions.groupLoaded(
{
id: action.params.id,
mute: action.params.mute,
},
));
break;
case 'Server.OnUpdate':
store.dispatch(snapcastActions.serverLoaded(action.params));
break;
}
break;
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action);
}
};
}());
})();
export default SnapcastMiddleware
export default SnapcastMiddleware;

View File

@ -1,51 +1,47 @@
export default function reducer(snapcast = {}, action){
switch (action.type){
export default function reducer(snapcast = {}, action) {
switch (action.type) {
case 'SNAPCAST_SERVER_LOADED':
var server = { ...action.server };
return { ...snapcast, server };
case 'SNAPCAST_SERVER_LOADED':
var server = Object.assign({}, action.server);
return Object.assign({}, snapcast, { server: server });
case 'SNAPCAST_CLIENTS_LOADED':
if (action.flush) {
var clients = {};
} else {
var clients = { ...snapcast.clients };
}
case 'SNAPCAST_CLIENTS_LOADED':
if (action.flush){
var clients = {};
} else {
var clients = Object.assign({}, snapcast.clients);
}
for (const client of action.clients) {
clients[client.id] = client;
}
return { ...snapcast, clients };
for (var client of action.clients){
clients[client.id] = client;
}
return Object.assign({}, snapcast, { clients: clients });
case 'SNAPCAST_GROUPS_LOADED':
if (action.flush) {
var groups = {};
} else {
var groups = { ...snapcast.groups };
}
case 'SNAPCAST_GROUPS_LOADED':
if (action.flush){
var groups = {};
} else {
var groups = Object.assign({}, snapcast.groups);
}
for (const group of action.groups) {
groups[group.id] = group;
}
return { ...snapcast, groups };
for (var group of action.groups){
groups[group.id] = group;
}
return Object.assign({}, snapcast, { groups: groups });
case 'SNAPCAST_STREAMS_LOADED':
if (action.flush) {
var streams = {};
} else {
var streams = { ...snapcast.streams };
}
case 'SNAPCAST_STREAMS_LOADED':
if (action.flush){
var streams = {};
} else {
var streams = Object.assign({}, snapcast.streams);
}
for (const stream of action.streams) {
streams[stream.id] = stream;
}
return { ...snapcast, streams };
for (var stream of action.streams){
streams[stream.id] = stream;
}
return Object.assign({}, snapcast, { streams: streams });
default:
return snapcast
}
default:
return snapcast;
}
}