diff --git a/platypush/backend/http/static/js/music.mpd.js b/platypush/backend/http/static/js/music.mpd.js
deleted file mode 100644
index 81e4877f9..000000000
--- a/platypush/backend/http/static/js/music.mpd.js
+++ /dev/null
@@ -1,868 +0,0 @@
-$(document).ready(function() {
- var seekInterval,
- longPressTimeout,
- curPath = [],
- curTrackUpdateHandler,
- curTrackElapsed = {
- timestamp: undefined,
- elapsed: undefined,
- },
-
- $musicSearchForm = $('#music-search-form'),
- $musicSearchResults = $('#music-search-results'),
- $musicSearchResultsContainer = $('#music-search-results-container'),
- $musicSearchResultsForm = $('#music-search-results-form'),
- $musicResultsAddBtn = $('#music-results-add'),
- $musicResultsPlayBtn = $('#music-results-play'),
- $resetSearchBtn = $('#music-search-reset');
- $doSearchBtns = $('.do-search-btns');
-
- var formatMinutes = function(time) {
- if (typeof time === 'string') {
- time = parseInt(time);
- } else if (isNaN(time)) {
- console.warn('Unexpected non-numeric value in formatMinutes');
- console.log(time);
- return undefined;
- }
-
- if (!time) {
- return '-:--';
- }
-
- var minutes = parseInt(time/60);
- var seconds = time%60;
- return (minutes < 10 ? '0' : '') + minutes + ':' + (seconds < 10 ? '0' : '') + seconds;
- };
-
- var updateControls = function(status, track) {
- var $playbackControls = $('.playback-controls');
- var $playlistContent = $('#playlist-content');
- var $curTrack = $('.track-info');
- var $volumeCtrl = $('#volume-ctrl');
- var $trackSeeker = $('#track-seeker');
- var $randomBtn = $playbackControls.find('[data-action=random]');
- var $repeatBtn = $playbackControls.find('[data-action=repeat]');
- var elapsed; var length;
-
- var timeToStr = (time) => {
- if (typeof time === 'string') {
- return time;
- }
-
- return parseInt(parseInt(time)/60) + ':'
- + (parseInt(time)%60 < 10 ? '0' : '') + (parseInt(time)%60);
- };
-
- if (status) {
- if ('position' in status) {
- elapsed = parseInt(status.position);
- $trackSeeker.val(elapsed);
- }
-
- if ('time' in status) {
- if (seekInterval) {
- clearInterval(seekInterval);
- seekInterval = undefined;
- }
-
- if (typeof status.time === 'string' && status.time.indexOf(':') > -1) {
- // backend.music.mpd time format: "elapsed:total"
- [elapsed, length] = status.time.split(':');
- elapsed = parseInt(elapsed);
- length = parseInt(length);
- } else {
- // backend.music.mopidy time format: integer with elapsed seconds
- length = parseInt(status.time);
- }
- }
-
- if (elapsed !== undefined) {
- $trackSeeker.val(elapsed);
- curTrackElapsed = {
- 'timestamp': new Date().getTime(),
- 'elapsed': elapsed,
- };
- }
-
- if (length !== undefined) {
- $trackSeeker.attr('max', length);
- }
-
- if ('state' in status) {
- switch (status.state.toLowerCase()) {
- case 'stop':
- $playbackControls.find('button[data-action=pause]').hide();
- $playbackControls.find('button[data-action=play]').show();
- $curTrack.find('.artist').hide();
- $curTrack.find('.track').hide();
- $curTrack.find('.no-track').show();
-
- $trackSeeker.prop('disabled', true);
- if (seekInterval) {
- clearInterval(seekInterval);
- seekInterval = undefined;
- }
-
- $('.seek-time').text('-:--');
- break;
-
- case 'pause':
- $playbackControls.find('button[data-action=pause]').hide();
- $playbackControls.find('button[data-action=play]').show();
- $curTrack.find('.artist').show();
- $curTrack.find('.track').show();
- $curTrack.find('.no-track').hide();
-
- $trackSeeker.prop('disabled', false);
- $('#seek-time-elapsed').text(elapsed ? timeToStr(elapsed) : '-:--');
- $('#seek-time-length').text(length ? timeToStr(length) : '-:--');
- break;
-
- case 'play':
- $playbackControls.find('button[data-action=pause]').show();
- $playbackControls.find('button[data-action=play]').hide();
- $curTrack.find('.artist').show();
- $curTrack.find('.track').show();
- $curTrack.find('.no-track').hide();
-
- $trackSeeker.prop('disabled', false);
- $('#seek-time-elapsed').text(elapsed ? timeToStr(elapsed) : '-:--');
- $('#seek-time-length').text(length ? timeToStr(length) : '-:--');
-
- seekInterval = setInterval(function() {
- if (curTrackElapsed.elapsed === undefined) {
- return;
- }
-
- var length = parseInt($trackSeeker.attr('max'));
- var value = parseInt((new Date().getTime() - curTrackElapsed.timestamp)/1000)
- + curTrackElapsed.elapsed;
-
- if (value < length) {
- $trackSeeker.val(value);
- elapsed = value;
- $('#seek-time-elapsed').text(timeToStr(elapsed));
- }
- }, 1000);
- break;
- }
- }
-
- if ('volume' in status) {
- $volumeCtrl.val(parseInt(status.volume));
- }
-
- if ('repeat' in status) {
- var repeat = parseInt(status.repeat);
- if (repeat) {
- $repeatBtn.addClass('enabled');
- } else {
- $repeatBtn.removeClass('enabled');
- }
- }
-
- if ('random' in status) {
- var random = parseInt(status.random);
- if (random) {
- $randomBtn.addClass('enabled');
- } else {
- $randomBtn.removeClass('enabled');
- }
- }
- }
-
- if (track) {
- $curTrack.find('.artist').text(track.artist);
- $curTrack.find('.track').text(track.title);
-
- var updatePlayingTrack = function(track) {
- return function() {
- var $curTrack = $playlistContent.find('.playlist-track').filter(
- function() { return $(this).data('file') === track.file });
-
- if ($curTrack.length === 0) {
- return;
- }
-
- var offset = $curTrack.offset().top
- - $playlistContent.offset().top
- + $playlistContent.scrollTop() - 10;
-
- $playlistContent.find('.playlist-track').removeClass('active');
- $curTrack.addClass('active');
- $playlistContent.animate({ scrollTop: offset }, 500)
- };
- };
-
- if ($playlistContent.find('.playlist-track').length === 0) {
- // Playlist viewer hasn't loaded yet
- curTrackUpdateHandler = updatePlayingTrack(track);
- } else {
- updatePlayingTrack(track)();
- }
- }
- };
-
- var onEvent = function(event) {
- switch (event.args.type) {
- case 'platypush.message.event.music.NewPlayingTrackEvent':
- createNotification({
- 'icon': 'play',
- 'html': '' + ('artist' in event.args.track ? event.args.track.artist : '')
- + '
'
- + ('title' in event.args.track ? event.args.track.title : '[No name]'),
- });
-
- case 'platypush.message.event.music.MusicStopEvent':
- case 'platypush.message.event.music.MusicPlayEvent':
- case 'platypush.message.event.music.MusicPauseEvent':
- case 'platypush.message.event.music.SeekChangeEvent':
- updateControls(status=event.args.status, track=event.args.track);
- break;
-
- case 'platypush.message.event.music.PlaylistChangeEvent':
- updatePlaylist(tracks=event.args.changes);
- break;
- }
- };
-
- var initStatus = function() {
- execute(
- {
- type: 'request',
- action: 'music.mpd.status',
- },
-
- onSuccess = function(response) {
- updateControls(status=response.response.output);
- }
- );
-
- execute(
- {
- type: 'request',
- action: 'music.mpd.currentsong',
- },
-
- onSuccess = function(response) {
- updateControls(status=undefined, track=response.response.output);
- }
- );
- };
-
- var onPlaylistTrackClick = function(event) {
- var $track = $(this);
-
- if (!$track.hasClass('selected')) {
- $('.playlist-track').removeClass('selected');
- $track.addClass('selected');
- } else {
- execute({
- type: 'request',
- action: 'music.mpd.playid',
- args: { track_id: $track.data('track-id') }
- });
- }
-
- if (longPressTimeout) {
- clearTimeout(longPressTimeout);
- longPressTimeout = undefined;
- }
- };
-
- var updatePlaylist = function(tracks) {
- if (tracks == null) {
- initPlaylist();
- return;
- }
-
- var $playlistContent = $('#playlist-content');
- $playlistContent.find('.playlist-track').remove();
-
- for (var track of tracks) {
- var $element = $('')
- .addClass('playlist-track')
- .addClass('row').addClass('music-item')
- .data('name', (track.artist || '') + ' ' + (track.title || ''))
- .data('track-id', parseInt(track.id))
- .data('pos', parseInt(track.pos))
- .data('file', track.file);
-
- var $artist = $('')
- .addClass('four').addClass('columns')
- .addClass('track-artist').text(track.artist);
-
- var $title = $('')
- .addClass('six').addClass('columns')
- .addClass('track-title').text(track.title);
-
- var $time = $('')
- .addClass('two').addClass('columns')
- .addClass('track-time').text(
- '' + parseInt(parseInt(track.time)/60) +
- ':' + (parseInt(track.time)%60 < 10 ? '0' : '') +
- parseInt(track.time)%60);
-
- $artist.appendTo($element);
- $title.appendTo($element);
- $time.appendTo($element);
-
- $element.on('click touch',onPlaylistTrackClick);
- $element.appendTo($playlistContent);
- }
-
- if (curTrackUpdateHandler) {
- curTrackUpdateHandler();
- curTrackUpdateHandler = undefined;
- }
- }
-
- var initPlaylist = function() {
- execute(
- {
- type: 'request',
- action: 'music.mpd.playlistinfo',
- },
-
- onSuccess = function(response) {
- updatePlaylist(response.response.output);
- }
- );
- };
-
- var onPlaylistTouchDown = function(event) {
- var $playlist = $(this);
- $playlist.addClass('selected');
-
- longPressTimeout = setTimeout(function() {
- clearTimeout(longPressTimeout);
- longPressTimeout = undefined;
- }, 1000);
- };
-
- var onPlaylistTouchUp = function(event) {
- var $playlist = $(this);
- if (longPressTimeout) {
- execute(
- {
- type: 'request',
- action: 'music.mpd.clear'
- },
-
- onSuccess = function() {
- execute(
- {
- type: 'request',
- action: 'music.mpd.load',
- args: { playlist: $playlist.data('name') }
- }
- );
- }
- );
- }
-
- clearTimeout(longPressTimeout);
- longPressTimeout = undefined;
- };
-
- var onFileTouchDown = function(event) {
- var $file = $(this);
- $file.addClass('selected');
-
- longPressTimeout = setTimeout(function() {
- clearTimeout(longPressTimeout);
- longPressTimeout = undefined;
- }, 1000);
- };
-
- var onFileTouchUp = function(event) {
- var $file = $(this);
- if (longPressTimeout) {
- execute(
- {
- type: 'request',
- action: 'music.mpd.playlistinfo'
- },
-
- onSuccess = function(response) {
- var pos = 0;
- if (response.response.output.length > 0) {
- pos = parseInt(response.response.output.slice(-1)[0].pos) + 1;
- }
-
- execute(
- {
- type: 'request',
- action: 'music.mpd.add',
- args: { resource: $file.data('file') }
- },
-
- onSuccess = function() {
- execute(
- {
- type: 'request',
- action: 'music.mpd.play_pos',
- args: { pos: pos }
- }
- );
- }
- )
- }
- );
-
- $file.removeClass('selected');
- }
-
- clearTimeout(longPressTimeout);
- longPressTimeout = undefined;
- };
-
- var onDirectorySelect = function(event) {
- var $directory = $(this);
- execute(
- {
- type: 'request',
- action: 'music.mpd.lsinfo',
- args: { uri: $directory.data('name') }
- },
-
- onSuccess = function(response) {
- curPath = $directory.data('name').split('/')
- .filter(function(term) { return term.length > 0 });
-
- updateBrowser(response.response.output);
- }
- );
- };
-
- var updateBrowser = function(items) {
- var $browserContent = $('#music-browser');
- var $browserFilter = $('#browser-filter');
- var $addButton = $('#browser-controls').find('button[data-action="add"]');
- var directories = [];
- var playlists = [];
- var files = [];
-
- $browserContent.find('.music-item').remove();
- $browserFilter.text('');
-
- for (var item of items) {
- if ('directory' in item) {
- directories.push(item.directory);
- } else if ('playlist' in item) {
- playlists.push(item.playlist);
- } else if ('file' in item) {
- files.push(item);
- }
- }
-
- if (curPath.length > 0) {
- var $parentElement = $('')
- .addClass('browser-directory').addClass('music-item')
- .addClass('browser-item').addClass('row').data('name', curPath.slice(0, -1).join('/'))
- .html(' ..');
-
- $parentElement.on('click touch', onDirectorySelect);
- $parentElement.appendTo($browserContent);
- $addButton.prop('disabled', false);
- } else {
- $addButton.prop('disabled', true);
- }
-
- for (var directory of directories.sort()) {
- var $element = $('')
- .addClass('browser-directory').addClass('music-item')
- .addClass('browser-item').addClass('row').data('name', directory)
- .html(' ' + directory.split('/').slice(-1)[0]);
-
- $element.on('click touch', onDirectorySelect);
- $element.appendTo($browserContent);
- }
-
- for (var playlist of playlists.sort()) {
- var $element = $('')
- .addClass('browser-playlist').addClass('music-item')
- .addClass('browser-item').addClass('row').data('name', playlist)
- .html(' ' + playlist);
-
- $element.on('mousedown touchstart', onPlaylistTouchDown);
- $element.on('mouseup touchend', onPlaylistTouchUp);
- $element.appendTo($browserContent);
- }
-
- files = files.sort(function(a, b) {
- if ((a.artist && !b.artist) || (a.album && !b.album)) {
- return -1;
- }
-
- if ((!a.artist && b.artist) || (!a.album && b.album)) {
- return 1;
- }
-
- if ((a.artist && b.artist) || (a.album && b.album)) {
- return 0;
- }
-
- if (a.artist === b.artist) {
- if (a.album === b.album) {
- return parseInt(a.track) < parseInt(b.track) ? -1 : 1;
- } else {
- return a.album.localeCompare(b.album);
- }
- } else {
- return a.artist.localeCompare(b.artist);
- }
- });
-
- for (var file of files) {
- var $element = $('')
- .addClass('browser-file').addClass('music-item')
- .addClass('browser-item').addClass('row')
- .html(' ' + file.title);
-
- for (var prop of Object.keys(file)) {
- $element.data(prop, file[prop]);
- }
-
- $element.on('mousedown touchstart', onFileTouchDown);
- $element.on('mouseup touchend', onFileTouchUp);
- $element.appendTo($browserContent);
- }
- };
-
- var initBrowser = function() {
- execute(
- {
- type: 'request',
- action: 'music.mpd.lsinfo',
- },
-
- onSuccess = function(response) {
- updateBrowser(response.response.output);
- }
- );
- };
-
- var initBindings = function() {
- window.registerEventListener(onEvent);
- var $playbackControls = $('.playback-controls, #playlist-controls').find('button');
- var $playlistContent = $('#playlist-content');
- var $playlistFilter = $('#playlist-filter');
- var $browserContent = $('#music-browser');
- var $browserFilter = $('#browser-filter');
- var $browserAddBtn = $('#browser-controls').find('button[data-action="add"]');
- var $volumeCtrl = $('#volume-ctrl');
- var $trackSeeker = $('#track-seeker');
- var prevVolume;
-
- $playbackControls.on('click', function(evt) {
- var action = $(this).data('action');
- var $btn = $(this);
- $btn.prop('disabled', true);
-
- execute(
- {
- type: 'request',
- action: 'music.mpd.' + action,
- },
-
- onSuccess = function(response) {
- updateControls(status=response.response.output);
- },
-
- onError=undefined,
- onComplete = function() {
- $btn.prop('disabled', false);
- }
- );
- });
-
- $volumeCtrl.on('mousedown touchstart', function(event) {
- prevVolume = $(this).val();
- });
-
- $volumeCtrl.on('mouseup touchend', function(event) {
- execute(
- {
- type: 'request',
- action: 'music.mpd.setvol',
- args: { vol: $(this).val() }
- },
-
- onSuccess=undefined,
- onError = function() {
- $volumeCtrl.val(prevVolume);
- }
- );
- });
-
- $trackSeeker.on('mouseup', function(event) {
- execute(
- {
- type: 'request',
- action: 'music.mpd.seekcur',
- args: { value: $(this).val() }
- },
-
- onSuccess = function(response) {
- var elapsed = parseInt(response.response.output.time.split(':')[0]);
- curTrackElapsed.elapsed = elapsed;
- }
- );
- });
-
- $browserAddBtn.on('click touch', function(event) {
- var $items = $browserContent.find('.music-item').slice(1, -1);
- var $selectedItems = $browserContent.find('.music-item.selected');
-
- if ($selectedItems.length == 0) {
- $selectedItems = $items;
- }
-
- for (var item of $selectedItems) {
- execute(
- {
- type: 'request',
- action: 'music.mpd.add',
- args: { resource: $(item).data('file') }
- }
- );
- }
- });
-
- $browserFilter.on('keyup', function(event) {
- var filterText = $(this).val().trim().toLowerCase();
- var $browserItems = $browserContent.find('.browser-item');
- $browserItems.hide();
-
- var matchedItems = $.grep($browserItems, function(item) {
- return $(item).data('name').toLowerCase().indexOf(filterText) >= 0;
- });
-
- $(matchedItems).show();
- });
-
- $playlistFilter.on('keyup', function(event) {
- var filterText = $(this).val().trim().toLowerCase();
- var $playlistItems = $playlistContent.find('.playlist-track');
- $playlistItems.hide();
-
- var matchedItems = $.grep($playlistItems, function(item) {
- return $(item).data('name').toLowerCase().indexOf(filterText) >= 0;
- });
-
- $(matchedItems).show();
- });
- };
-
- var initSearch = function() {
- $musicSearchForm.on('submit', function(event) {
- var searchData = $(this).serializeArray().reduce(function(obj, item) {
- var value = item.value.trim();
- if (value.length > 0) {
- obj[item.name] = item.value;
- }
-
- return obj;
- }, {});
-
- var filter = [];
- for (var searchItem of Object.keys(searchData)) {
- filter.push(searchItem);
- filter.push(searchData[searchItem]);
- }
-
- $(this).find('input').prop('disabled', true);
-
- execute(
- {
- type: 'request',
- action: 'music.mpd.search',
- args: {
- filter: filter
- }
- },
-
- onSuccess = function(response) {
- var results = response.response.output;
- if (!results) {
- return false;
- }
-
- if (Object.keys(searchData).length > 1) {
- results = results.filter(function(item) {
- return (
- ('title' in searchData
- ? (item.title || '').toLowerCase().indexOf(
- searchData.title.toLowerCase()) >= 0
- : true) &&
- ('album' in searchData
- ? (item.album || '').toLowerCase().indexOf(
- searchData.album.toLowerCase()) >= 0
- : true) &&
- ('artist' in searchData
- ? (item.artist || '').toLowerCase().indexOf(
- searchData.artist.toLowerCase()) >= 0
- : true)
- );
- });
- }
-
- for (var item of results) {
- var $item = $('')
- .addClass('row').addClass('music-item')
- .addClass('music-search-item')
- .data('file', item.file);
-
- var $artist = $('')
- .addClass('three columns').addClass('artist')
- .addClass('music-search-item-artist')
-
- if ('artist' in item) {
- $artist.text(item.artist);
- } else {
- $artist.html(' ');
- }
-
- var $title = $('')
- .addClass('four columns').addClass('title')
- .addClass('music-search-item-title');
-
- if ('title' in item) {
- $title.text(item.title);
- } else {
- $title.html(' ');
- }
-
- var $album = $('')
- .addClass('four columns').addClass('album')
- .addClass('music-search-item-album');
-
- if ('album' in item) {
- $album.text(item.album);
- } else {
- $album.html(' ');
- }
-
- var $time = $('')
- .addClass('one column').addClass('time')
- .addClass('music-search-item-time')
- .text('time' in item ? formatMinutes(item.time) : '-:--');
-
- $artist.appendTo($item);
- $title.appendTo($item);
- $album.appendTo($item);
- $time.appendTo($item);
- $item.appendTo($musicSearchResults);
- }
- },
-
- onError = function(xhr, status, error) {
- console.error(error);
- },
-
- onComplete = function() {
- $musicSearchForm.find('input').prop('disabled', false);
- $musicSearchForm.hide();
- $musicSearchResultsContainer.show();
- $musicSearchResultsForm.show();
- }
- );
-
- return false;
- });
-
- $resetSearchBtn.on('click', function(event) {
- $musicSearchResultsForm.hide();
- $musicSearchResultsContainer.hide();
- $musicSearchResults.html('');
- $musicSearchForm.show();
-
- $musicResultsAddBtn.removeData('file');
- $musicResultsAddBtn.prop('disabled', true);
- $musicResultsPlayBtn.removeData('file');
- $musicResultsPlayBtn.prop('disabled', true);
- });
-
- $musicSearchResults.on('click', '.music-search-item', function(event) {
- var isCurrentlySelected = $(this).hasClass('selected');
- $('.music-search-item').removeClass('selected');
-
- if (isCurrentlySelected) {
- $musicResultsAddBtn.removeData('file');
- $musicResultsAddBtn.prop('disabled', true);
- $musicResultsPlayBtn.removeData('file');
- $musicResultsPlayBtn.prop('disabled', true);
-
- $(this).removeClass('selected');
- } else {
- var file = $(this).data('file');
-
- $musicResultsAddBtn.data('file', file);
- $musicResultsAddBtn.prop('disabled', false);
- $musicResultsPlayBtn.data('file', file);
- $musicResultsPlayBtn.prop('disabled', false);
- $(this).addClass('selected');
- }
- });
-
- $musicSearchResultsForm.on('submit', function(event) {
- return false;
- });
-
- $musicResultsAddBtn.on('click', function(event) {
- var file = $(this).data('file');
- if (!file) {
- return false;
- }
-
- execute(
- {
- type: 'request',
- action: 'music.mpd.add',
- args: {
- resource: file
- }
- },
-
- onSuccess = function(response) {
- initPlaylist();
- }
- );
- });
-
- $musicResultsPlayBtn.on('click', function(event) {
- var file = $(this).data('file');
- if (!file) {
- return false;
- }
-
- execute(
- {
- type: 'request',
- action: 'music.mpd.play',
- args: {
- resource: file
- }
- },
-
- onSuccess = function(response) {
- initPlaylist();
- initStatus();
- }
- );
- });
- };
-
- var init = function() {
- initStatus();
- initPlaylist();
- initBrowser();
- initSearch();
- initBindings();
- };
-
- init();
-});
-