diff --git a/platypush/backend/http/static/css/music.snapcast.css b/platypush/backend/http/static/css/music.snapcast.css index 6debfd8d..5cb18d1d 100644 --- a/platypush/backend/http/static/css/music.snapcast.css +++ b/platypush/backend/http/static/css/music.snapcast.css @@ -121,19 +121,24 @@ text-align: right; } + .snapcast-form > .snapcast-group-stream, .snapcast-form > .snapcast-client-delete { width: 30%; margin: 1em auto 0 auto; text-align: center; } + .snapcast-form > .snapcast-group-stream > label, .snapcast-form > .snapcast-client-delete > label { display: inline; margin-left: .5em; - color: rgba(200, 44, 23, 1.0); text-align: right; } + .snapcast-form > .snapcast-client-delete > label { + color: rgba(200, 44, 23, 1.0); + } + .snapcast-form * > .snapcast-group-clients { max-width: 15em; margin: auto; diff --git a/platypush/backend/http/static/js/music.snapcast.js b/platypush/backend/http/static/js/music.snapcast.js index e11d663e..6fe41662 100644 --- a/platypush/backend/http/static/js/music.snapcast.js +++ b/platypush/backend/http/static/js/music.snapcast.js @@ -1,6 +1,8 @@ $(document).ready(function() { var serverInfo = {}, clientInfo = {}, + serverStreams = {}, + groupStreams = {}, $container = $('#snapcast-container'); var createPowerToggleElement = function(data) { @@ -71,6 +73,8 @@ $(document).ready(function() { $container.html(''); serverInfo = {}; clientInfo = {}; + serverStreams = {}; + groupStreams = {}; var hosts = Object.keys(window.config.snapcast_hosts); @@ -78,6 +82,8 @@ $(document).ready(function() { var status = statuses[i]; var host = hosts[i]; var name = status.server.host.name || status.server.host.ip; + + serverStreams[host] = status.streams; serverInfo[host] = status.server.host; serverInfo[host].serverName = status.server.snapserver.serverName; serverInfo[host].version = status.server.snapserver.version; @@ -114,6 +120,8 @@ $(document).ready(function() { for (var group of status.groups) { var groupName = group.name || group.stream_id; + groupStreams[group.id] = group.stream_id; + var $group = $('
') .addClass('snapcast-group-container') .data('name', groupName) @@ -336,6 +344,23 @@ $(document).ready(function() { $label.appendTo($row); $row.appendTo($clientsList); } + + var $streams = $form.find('.snapcast-group-stream').find('select[name=stream]'); + $streams.html(''); + + for (var stream of serverStreams[host]) { + var $option = $('').val(stream.id) + .text(stream.id); + + if (stream.id === groupStreams[groupId]) { + $option.prop('selected', true); + } + + $option.appendTo($streams); + } + + $form.find('.snapcast-group-stream') + .find('select[name=stream]').html($streams.html()); }); $container.on('click touch', '.snapcast-client-settings', function(evt) { @@ -431,36 +456,48 @@ $(document).ready(function() { clients.push($(c).attr('name')); } - var request = { - type: 'request', - action: 'music.snapcast.group_set_clients', - args: { - host: host, - port: window.config.snapcast_hosts[host], - group: groupId, - clients: clients, - }, - }; + var streamId = $form.find('.snapcast-group-stream') + .find('select[name=stream]').val(); - $form.find('input').prop('disabled', true); + var promises = [ + execute({ + type: 'request', + action: 'music.snapcast.group_set_clients', + args: { + host: host, + port: window.config.snapcast_hosts[host], + group: groupId, + clients: clients, + } + }), + execute({ + type: 'request', + action: 'music.snapcast.group_set_stream', + args: { + host: host, + port: window.config.snapcast_hosts[host], + group: groupId, + stream_id: streamId, + } + }), + ]; - execute( - request, - (response) => { - redraw(); - }, + $.when.apply($, promises) + .fail( (xhr, status, error) => { createNotification({ 'icon': 'exclamation', 'text': status + ': ' + error, }); - }, + } + ).always( () => { $form.find('input').prop('disabled', false); $modal.fadeOut(); } ); + $form.find('input').prop('disabled', true); return false; }); }; diff --git a/platypush/backend/http/templates/plugins/music.snapcast.html b/platypush/backend/http/templates/plugins/music.snapcast.html index a23372c7..16b48cbb 100644 --- a/platypush/backend/http/templates/plugins/music.snapcast.html +++ b/platypush/backend/http/templates/plugins/music.snapcast.html @@ -77,6 +77,10 @@