andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix:Use explicit Mopidy.js calling convention.

Browse Source
This commit is contained in:
jcass 2016-01-30 13:54:40 +02:00
parent 1a9070fbe5
commit a9338a6ec8
8 changed files with 113 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@ -103,6 +103,7 @@ v2.1.0 (UNRELEASED)
- Fix vertical alignment of playback control buttons in footer. - Fix vertical alignment of playback control buttons in footer.
- Increase width of header so that more text can be rendered in the title bar. - Increase width of header so that more text can be rendered in the title bar.
(Fixes: `#144 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/144>`_). (Fixes: `#144 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/144>`_).
- Use explicit Mopidy.js calling convention. (Fixes: `#79 <https://github.com/pimusicbox/mopidy-musicbox-webclient/issues/79>`_).
v2.0.0 (2015-03-26) v2.0.0 (2015-03-26)

122
mopidy_musicbox_webclient/static/js/controls.js vendored
View File

@ -1,6 +1,6 @@
/******************************************************** /***********************************
* play tracks from a browse list * play tracks from a browse list *
*********************************************************/ ***********************************/
function playBrowsedTracks(action, trackIndex) { function playBrowsedTracks(action, trackIndex) {
$('#popupBrowse').popup('close'); $('#popupBrowse').popup('close');
toast('Loading...'); toast('Loading...');
@ -32,7 +32,7 @@ function playBrowsedTracks(action, trackIndex) {
var maybePlay = function(tlTracks) { var maybePlay = function(tlTracks) {
if (action === PLAY_NOW || action === PLAY_ALL) { if (action === PLAY_NOW || action === PLAY_ALL) {
var playIndex = (action === PLAY_ALL) ? trackIndex : 0; var playIndex = (action === PLAY_ALL) ? trackIndex : 0;
mopidy.playback.play(tlTracks[playIndex]); mopidy.playback.play({'tl_track': tlTracks[playIndex]});
} }
}; };
@ -40,13 +40,13 @@ function playBrowsedTracks(action, trackIndex) {
case PLAY_NOW: case PLAY_NOW:
case PLAY_NEXT: case PLAY_NEXT:
mopidy.tracklist.index().then(function (currentIndex) { mopidy.tracklist.index().then(function (currentIndex) {
mopidy.tracklist.add(null, currentIndex + 1, null, trackUris).then(maybePlay); mopidy.tracklist.add({'at_position': currentIndex + 1, 'uris': trackUris}).then(maybePlay);
}); });
break; break;
case ADD_THIS_BOTTOM: case ADD_THIS_BOTTOM:
case ADD_ALL_BOTTOM: case ADD_ALL_BOTTOM:
case PLAY_ALL: case PLAY_ALL:
mopidy.tracklist.add(null, null, null, trackUris).then(maybePlay); mopidy.tracklist.add({'uris': trackUris}).then(maybePlay);
break; break;
default: default:
break; break;
@ -54,10 +54,9 @@ function playBrowsedTracks(action, trackIndex) {
return false; return false;
} }
/*********************************
/******************************************************** * play an uri from a tracklist *
* play an uri from a tracklist *********************************/
*********************************************************/
function playTrack(action) { function playTrack(action) {
var hash = document.location.hash.split('?'); var hash = document.location.hash.split('?');
var divid = hash[0].substr(1); var divid = hash[0].substr(1);
@ -92,21 +91,21 @@ function playTrack(action) {
case PLAY_NOW: case PLAY_NOW:
case PLAY_NOW_SEARCH: case PLAY_NOW_SEARCH:
mopidy.tracklist.clear().then( mopidy.tracklist.clear().then(
mopidy.tracklist.add(null, null, null, trackUris).then( mopidy.tracklist.add({'uris': trackUris}).then(
function(tlTracks) { function(tlTracks) {
mopidy.playback.play(tlTracks[selected]) mopidy.playback.play({'tl_track': tlTracks[selected]})
} }
) )
); );
break; break;
case PLAY_NEXT: case PLAY_NEXT:
mopidy.tracklist.index().then(function(currentIndex) { mopidy.tracklist.index().then(function(currentIndex) {
mopidy.tracklist.add(null, currentIndex + 1, null, trackUris); mopidy.tracklist.add({'at_position': currentIndex + 1, 'uris': trackUris});
}); });
break; break;
case ADD_THIS_BOTTOM: case ADD_THIS_BOTTOM:
case ADD_ALL_BOTTOM: case ADD_ALL_BOTTOM:
mopidy.tracklist.add(null, null, null, trackUris); mopidy.tracklist.add({'uris': trackUris});
break; break;
} }
return false; return false;
@ -123,7 +122,7 @@ function playTrackByUri(track_uri, playlist_uri) {
// Find track that was selected // Find track that was selected
for (var selected = 0; selected < tltracks.length; selected++) { for (var selected = 0; selected < tltracks.length; selected++) {
if (tltracks[selected].track.uri == track_uri) { if (tltracks[selected].track.uri == track_uri) {
mopidy.playback.play(tltracks[selected]); mopidy.playback.play({'tl_track': tltracks[selected]});
return; return;
} }
} }
@ -142,11 +141,11 @@ function playTrackByUri(track_uri, playlist_uri) {
toast('Loading...'); toast('Loading...');
mopidy.tracklist.add(null, null, playlist_uri).then(function(tltracks) { mopidy.tracklist.add({'uris': [playlist_uri]}).then(function(tltracks) {
// Can fail for all sorts of reasons. If so, just add individually. // Can fail for all sorts of reasons. If so, just add individually.
if (tltracks.length == 0) { if (tltracks.length == 0) {
var trackUris = getTracksFromUri(playlist_uri, false); var trackUris = getTracksFromUri(playlist_uri, false);
mopidy.tracklist.add(null, null, null, trackUris).then(findAndPlayTrack); mopidy.tracklist.add({'uris': trackUris}).then(findAndPlayTrack);
} else { } else {
findAndPlayTrack(tltracks); findAndPlayTrack(tltracks);
} }
@ -165,7 +164,6 @@ function playTrackByUri(track_uri, playlist_uri) {
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackQueueByTlid(uri, tlid) { function playTrackQueueByTlid(uri, tlid) {
// console.log('playquuri');
//stop directly, for user feedback //stop directly, for user feedback
mopidy.playback.stop(); mopidy.playback.stop();
$('#popupQueue').popup('close'); $('#popupQueue').popup('close');
@ -177,7 +175,7 @@ function playTrackQueueByTlid(uri, tlid) {
}).then( }).then(
function(tltracks) { function(tltracks) {
if (tltracks.length > 0) { if (tltracks.length > 0) {
mopidy.playback.play(tltracks[0]); mopidy.playback.play({'tl_track': tltracks[0]});
return; return;
} }
console.log('Failed to play selected track ', tlid); console.log('Failed to play selected track ', tlid);
@ -191,22 +189,21 @@ function playTrackQueueByTlid(uri, tlid) {
* @returns {boolean} * @returns {boolean}
*/ */
function playTrackQueue() { function playTrackQueue() {
// console.log('playqu');
uri = $('#popupQueue').data("track"); uri = $('#popupQueue').data("track");
tlid = $('#popupQueue').data("tlid"); tlid = $('#popupQueue').data("tlid");
return playTrackQueueByTlid(uri, tlid); return playTrackQueueByTlid(uri, tlid);
} }
/******************************************************** /***********************************
* remove a track from the queue * remove a track from the queue *
*********************************************************/ ***********************************/
function removeTrack() { function removeTrack() {
$('#popupQueue').popup('close'); $('#popupQueue').popup('close');
toast('Deleting...'); toast('Deleting...');
tlid = parseInt($('#popupQueue').data("tlid")); tlid = parseInt($('#popupQueue').data("tlid"));
console.log(tlid); console.log(tlid);
mopidy.tracklist.remove({'tlid':[tlid]}); mopidy.tracklist.remove({'tlid': [tlid]});
} }
function clearQueue() { function clearQueue() {
@ -228,9 +225,9 @@ function saveQueue() {
exists = exists || existing[i].uri.indexOf("m3u:") == 0 || existing[i].uri.indexOf("local:") == 0; exists = exists || existing[i].uri.indexOf("m3u:") == 0 || existing[i].uri.indexOf("local:") == 0;
} }
if (!exists || window.confirm("Overwrite existing playlist \"" + plname + "\"?")) { if (!exists || window.confirm("Overwrite existing playlist \"" + plname + "\"?")) {
mopidy.playlists.create(plname, "local").then(function(playlist) { mopidy.playlists.create({'name': plname, 'uri_scheme': "local").then(function(playlist) {
playlist.tracks = tracks; playlist.tracks = tracks;
mopidy.playlists.save(playlist).then(); mopidy.playlists.save({'playlist': playlist}).then();
getPlaylists(); getPlaylists();
}); });
} }
@ -241,15 +238,14 @@ function saveQueue() {
return false; return false;
} }
function refreshPlaylists() { function refreshPlaylists() {
mopidy.playlists.refresh(); mopidy.playlists.refresh();
return false; return false;
} }
/********************** /*************
* Buttons * Buttons *
*/ *************/
function doShuffle() { function doShuffle() {
mopidy.playback.stop(); mopidy.playback.stop();
@ -303,10 +299,9 @@ function backbt() {
return false; return false;
} }
/*************** /*************
* Options * Options *
***************/ *************/
function setTracklistOption(name, new_value) { function setTracklistOption(name, new_value) {
if (!new_value) { if (!new_value) {
$("#"+name+"bt").attr('style', 'color:#2489ce'); $("#"+name+"bt").attr('style', 'color:#2489ce');
@ -341,27 +336,26 @@ function setSingle(nwsingle) {
} }
function doRandom() { function doRandom() {
mopidy.tracklist.setRandom(!random).then(); mopidy.tracklist.setRandom({'value': !random}).then();
} }
function doRepeat() { function doRepeat() {
mopidy.tracklist.setRepeat(!repeat).then(); mopidy.tracklist.setRepeat({'value': !repeat}).then();
} }
function doConsume() { function doConsume() {
mopidy.tracklist.setConsume(!consume).then(); mopidy.tracklist.setConsume({'value': !consume}).then();
} }
function doSingle() { function doSingle() {
mopidy.tracklist.setSingle(!single).then(); mopidy.tracklist.setSingle({'value': !single}).then();
} }
/********************* /***********************************************
* Track Slider * Track Slider *
* Use a timer to prevent looping of commands * Use a timer to prevent looping of commands *
*********************/ ***********************************************/
function doSeekPos(value) { function doSeekPos(value) {
var val = $("#trackslider").val(); var val = $("#trackslider").val();
newposition = Math.round(val); newposition = Math.round(val);
@ -377,10 +371,7 @@ function doSeekPos(value) {
function triggerPos() { function triggerPos() {
if (mopidy) { if (mopidy) {
posChanging = true; posChanging = true;
// mopidy.playback.pause(); mopidy.playback.seek({'time_position': newposition});
// console.log(newposition);
mopidy.playback.seek(newposition);
// mopidy.playback.resume();
resumePosTimer(); resumePosTimer();
posChanging = false; posChanging = false;
} }
@ -402,10 +393,10 @@ function setPosition(pos) {
$("#songelapsed").html(timeFromSeconds(currentposition / 1000)); $("#songelapsed").html(timeFromSeconds(currentposition / 1000));
} }
/******************** /***********************************************
* Volume slider * Volume slider *
* Use a timer to prevent looping of commands * Use a timer to prevent looping of commands *
*/ ***********************************************/
function setVolume(value) { function setVolume(value) {
if ($("#volumeslider").val() != value) { if ($("#volumeslider").val() != value) {
@ -420,7 +411,7 @@ function doVolume(value) {
} }
function triggerVolume() { function triggerVolume() {
mopidy.playback.setVolume(parseInt(volumeChanging)); mopidy.playback.setVolume({'volume': parseInt(volumeChanging)});
volumeChanging = 0; volumeChanging = 0;
} }
@ -436,18 +427,17 @@ function setMute(nwmute) {
} }
function doMute() { function doMute() {
mopidy.mixer.setMute(!mute); mopidy.mixer.setMute({'mute': !mute});
} }
/******* /**************************
* Track position timer * Track position timer *
*/ **************************/
//timer function to update interface //timer function to update interface
function updatePosTimer() { function updatePosTimer() {
currentposition += TRACK_TIMER; currentposition += TRACK_TIMER;
setPosition(currentposition); setPosition(currentposition);
// $("#songelapsed").html(timeFromSeconds(currentposition / 1000));
} }
function resumePosTimer() { function resumePosTimer() {
@ -467,9 +457,9 @@ function pausePosTimer() {
clearInterval(posTimer); clearInterval(posTimer);
} }
/********************************* /************
* Stream * Stream *
*********************************/ ************/
function streamPressed(key) { function streamPressed(key) {
if (key == 13) { if (key == 13) {
playStreamUri(); playStreamUri();
@ -493,7 +483,7 @@ function playStreamUri(uri) {
document.activeElement.blur(); document.activeElement.blur();
clearQueue(); clearQueue();
$("input").blur(); $("input").blur();
mopidy.tracklist.add(null, null, nwuri); mopidy.tracklist.add({'uris': [nwuri]});
mopidy.playback.play(); mopidy.playback.play();
} else { } else {
toast('No valid url!'); toast('No valid url!');
@ -524,7 +514,7 @@ function getPlaylistByName(name, scheme, create) {
} }
} }
if (create) { if (create) {
return mopidy.playlists.create(name, scheme).done(function(plist) { return mopidy.playlists.create({'name': name, 'uri_scheme': scheme}).done(function(plist) {
console.log("Created playlist '%s'", plist.name); console.log("Created playlist '%s'", plist.name);
return plist; return plist;
}); });
@ -534,7 +524,7 @@ function getPlaylistByName(name, scheme, create) {
} }
function getPlaylistFull(uri) { function getPlaylistFull(uri) {
return mopidy.playlists.lookup(uri).then(function(pl) { return mopidy.playlists.lookup({'uri': uri}).then(function(pl) {
playlists[uri] = pl; playlists[uri] = pl;
return pl; return pl;
}); });
@ -551,7 +541,7 @@ function getFavourites() {
function addFavourite(uri, name) { function addFavourite(uri, name) {
var uri = uri || $('#streamuriinput').val().trim(); var uri = uri || $('#streamuriinput').val().trim();
var name = name || $('#streamnameinput').val().trim(); var name = name || $('#streamnameinput').val().trim();
mopidy.library.lookup(null, [uri]).then(function(results) { mopidy.library.lookup({'uris': [uri]}).then(function(results) {
var newTracks = results[uri]; var newTracks = results[uri];
if (newTracks.length == 1) { if (newTracks.length == 1) {
// TODO: Supporting adding an entire playlist? // TODO: Supporting adding an entire playlist?
@ -566,7 +556,7 @@ function addFavourite(uri, name) {
} else { } else {
favourites.tracks = [newTracks[0]]; favourites.tracks = [newTracks[0]];
} }
mopidy.playlists.save(favourites).then(function(s) { mopidy.playlists.save({'playlist': favourites}).then(function(s) {
showFavourites(); showFavourites();
}); });
} }
@ -587,7 +577,7 @@ function deleteFavourite(index) {
var name = favourites.tracks[index].name; var name = favourites.tracks[index].name;
if (confirm("Are you sure you want to remove '" + name + "'?")) { if (confirm("Are you sure you want to remove '" + name + "'?")) {
favourites.tracks.splice(index, 1); favourites.tracks.splice(index, 1);
mopidy.playlists.save(favourites).then(function(s) { mopidy.playlists.save({'playlist': favourites}).then(function(s) {
showFavourites(); showFavourites();
}); });
} }

30
mopidy_musicbox_webclient/static/js/functionsvars.js
View File

@ -28,7 +28,7 @@ var songlength = 0;
var artistshtml = ''; var artistshtml = '';
var artiststext = ''; var artiststext = '';
var songname = ''; var songname = '';
var songdata = {'track':{}, 'tlid':-1}; var songdata = {'track': {}, 'tlid': -1};
var newposition = 0; var newposition = 0;
var playlisttracksScroll; var playlisttracksScroll;
@ -53,7 +53,6 @@ var ua = navigator.userAgent,
//constants //constants
PROGRAM_NAME = 'MusicBox'; PROGRAM_NAME = 'MusicBox';
//PROGRAM_NAME = 'Mopidy';
ARTIST_TABLE = '#artiststable'; ARTIST_TABLE = '#artiststable';
ALBUM_TABLE = '#albumstable'; ALBUM_TABLE = '#albumstable';
PLAYLIST_TABLE = '#playlisttracks'; PLAYLIST_TABLE = '#playlisttracks';
@ -127,10 +126,6 @@ function scrollToTop() {
} }
function scrollToTracklist() { function scrollToTracklist() {
/* if (isMobileWebkit) {
playlistslistScroll.refresh();
}
*/
var divtop = $("#playlisttracksdiv").offset().top - 120; var divtop = $("#playlisttracksdiv").offset().top - 120;
$('body,html').animate({ $('body,html').animate({
scrollTop: divtop scrollTop: divtop
@ -198,12 +193,10 @@ function renderSongLi(song, liID, uri) {
} else { } else {
name = song.name; name = song.name;
} }
// var iconClass = getMediaClass(liID.split('-')[1]);
songLi = '<li class="song albumli" id="' + liID + '">' + songLi = '<li class="song albumli" id="' + liID + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return playTrackByUri(\'' + song.uri + '\',\'' + uri + '\');">' + '<a href="#" onclick="return playTrackByUri(\'' + song.uri + '\',\'' + uri + '\');">' +
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
'<h1 class="trackname">' + name + '</h1></a>' + '<h1 class="trackname">' + name + '</h1></a>' +
'</li>'; '</li>';
return songLi; return songLi;
@ -217,12 +210,10 @@ function renderQueueSongLi(song, liID, uri, tlid) {
} else { } else {
name = song.name; name = song.name;
} }
// var iconClass = getMediaClass(liID.split('-')[1]);
songLi = '<li class="song albumli" id="' + liID + '" tlid="' + tlid + '">' + songLi = '<li class="song albumli" id="' + liID + '" tlid="' + tlid + '">' +
'<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\',\'' + tlid + '\');">' + '<a href="#" class="moreBtn" onclick="return popupTracks(event, \'' + uri + '\',\'' + song.uri + '\',\'' + tlid + '\');">' +
'<i class="fa fa-ellipsis-v"></i></a>' + '<i class="fa fa-ellipsis-v"></i></a>' +
'<a href="#" onclick="return playTrackQueueByTlid(\'' + song.uri + '\',\'' + tlid + '\');">' + '<a href="#" onclick="return playTrackQueueByTlid(\'' + song.uri + '\',\'' + tlid + '\');">' +
// '<h1 class="trackname"><i class="' + iconClass + '"></i> ' + name + '</h1>' +
'<h1 class="trackname">' + name + '</h1></a>' + '<h1 class="trackname">' + name + '</h1></a>' +
'</li>'; '</li>';
return songLi; return songLi;
@ -310,7 +301,6 @@ function resultsToTables(results, target, uri) {
'<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>"; '<h1><i class="' + iconClass + '"></i> ' + newalbum[0].name + "</h1><p>";
} }
/* '<span style="float: right;">' + timeFromSeconds(newalbum[0].length / 1000) + '</span>'; */
if (newalbum[0].artists) { if (newalbum[0].artists) {
for (j = 0; j < newalbum[0].artists.length; j++) { for (j = 0; j < newalbum[0].artists.length; j++) {
html += newalbum[0].artists[j].name; html += newalbum[0].artists[j].name;
@ -333,7 +323,6 @@ function resultsToTables(results, target, uri) {
newtlids = []; newtlids = [];
} else { //newalbum length } else { //newalbum length
if (results[i].album.uri && results[i].album.name) { if (results[i].album.uri && results[i].album.name) {
// iconClass = getMediaClass(results[i].album.uri);
iconClass = getMediaClass(newalbum[0].uri); iconClass = getMediaClass(newalbum[0].uri);
html += '<li class="albumdivider">'; html += '<li class="albumdivider">';
html += '<a href="#" onclick="return showAlbum(\'' + results[i].album.uri + '\');"><img id="' + html += '<a href="#" onclick="return showAlbum(\'' + results[i].album.uri + '\');"><img id="' +
@ -353,8 +342,6 @@ function resultsToTables(results, target, uri) {
html += '</p></a></li>'; html += '</p></a></li>';
for (j = 0; j < newalbum.length; j++) { for (j = 0; j < newalbum.length; j++) {
popupData[newalbum[j].uri] = newalbum[j]; popupData[newalbum[j].uri] = newalbum[j];
// html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return ' + popupMenu + '(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">';
//hERE! //hERE!
var liID = targetmin + '-' + newalbum[j].uri; var liID = targetmin + '-' + newalbum[j].uri;
if (target == CURRENT_PLAYLIST_TABLE) { if (target == CURRENT_PLAYLIST_TABLE) {
@ -362,9 +349,6 @@ function resultsToTables(results, target, uri) {
} else { } else {
html += renderSongLi(newalbum[j], liID, uri); html += renderSongLi(newalbum[j], liID, uri);
} }
//html += '<li class="albumli" id="' + targetmin + '-' + newalbum[j].uri + '"><a href="#" onclick="return popupTracks(event, \'' + uri + '\',\'' + newalbum[j].uri + '\');">';
//html += '<p class="pright">' + timeFromSeconds(newalbum[j].length / 1000) + '</p><h1>' + newalbum[j].name + '</h1></a></li>';
} }
newalbum = []; newalbum = [];
newtlids = []; newtlids = [];
@ -383,7 +367,6 @@ function resultsToTables(results, target, uri) {
$(target).attr('data', uri); $(target).attr('data', uri);
//retreive albumcovers //retreive albumcovers
for (i = 0; i < coversList.length; i++) { for (i = 0; i < coversList.length; i++) {
// console.log(coversList[i]);
getCover(coversList[i][0], target + '-cover-' + coversList[i][1], 'small'); getCover(coversList[i][0], target + '-cover-' + coversList[i][1], 'small');
} }
} }
@ -401,7 +384,6 @@ function playlisttotable(pl, target, uri) {
child += '<h1>' + pl[i].name + "</h1>"; child += '<h1>' + pl[i].name + "</h1>";
child += '<p>'; child += '<p>';
child += '<span style="float: right;">' + timeFromSeconds(pl[i].length / 1000) + '</span>'; child += '<span style="float: right;">' + timeFromSeconds(pl[i].length / 1000) + '</span>';
// <span class="ui-icon ui-icon-arrow-r ui-icon-shadow">&nbsp;</span>
for (var j = 0; j < pl[i].artists.length; j++) { for (var j = 0; j < pl[i].artists.length; j++) {
if (pl[i].artists[j]) { if (pl[i].artists[j]) {
child += pl[i].artists[j].name; child += pl[i].artists[j].name;
@ -428,7 +410,7 @@ function getPlaylistTracks(uri) {
return Mopidy.when(playlists[uri].tracks); return Mopidy.when(playlists[uri].tracks);
} else { } else {
showLoading(true); showLoading(true);
return mopidy.playlists.getItems(uri).then(function(refs) { return mopidy.playlists.getItems({'uri': uri}).then(function(refs) {
return processPlaylistItems({'uri':uri, 'items':refs}); return processPlaylistItems({'uri':uri, 'items':refs});
}, console.error); }, console.error);
} }
@ -463,7 +445,6 @@ function timeFromSeconds(length) {
return ((h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "0:") + (s < 10 ? "0" : "") + s); return ((h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "0:") + (s < 10 ? "0" : "") + s);
} }
/******* Toast ***/ /******* Toast ***/
function toast(message, delay, textOnly) { function toast(message, delay, textOnly) {
textOnl = textOnly || false; textOnl = textOnly || false;
@ -482,9 +463,9 @@ function toast(message, delay, textOnly) {
} }
} }
/***************** /******************
* Modal dialogs * Modal dialogs *
*****************/ ******************/
function showLoading(on) { function showLoading(on) {
if (on) { if (on) {
$("body").css("cursor", "progress"); $("body").css("cursor", "progress");
@ -515,7 +496,6 @@ function showOffline(on) {
// from http://dzone.com/snippets/validate-url-regexp // from http://dzone.com/snippets/validate-url-regexp
function validUri(str) { function validUri(str) {
var regexp = /^(mms|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/ var regexp = /^(mms|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
// return regexp.test(str) || isServiceUri(str);
return regexp.test(str); return regexp.test(str);
} }

5
mopidy_musicbox_webclient/static/js/gui.js
View File

@ -483,10 +483,11 @@ $(document).ready(function(event) {
// Connect to server // Connect to server
if (websocketUrl) { if (websocketUrl) {
mopidy = new Mopidy({ mopidy = new Mopidy({
webSocketUrl: websocketUrl // wslocation is set in index.html from the extention config. webSocketUrl: websocketUrl, // wslocation is set in index.html from the extention config.
callingConvention: "by-position-or-by-name"
}); });
} else { } else {
mopidy = new Mopidy(); mopidy = new Mopidy({callingConvention: "by-position-or-by-name"});
} }
// mopidy.on(console.log.bind(console)); // Log all events // mopidy.on(console.log.bind(console)); // Log all events
// mopidy.on(console.error.bind(console)); // mopidy.on(console.error.bind(console));

63
mopidy_musicbox_webclient/static/js/images.js
View File

@ -2,14 +2,13 @@
* @author Wouter van Wijk * @author Wouter van Wijk
*/ */
API_KEY= 'b6d34c3af91d62ab0ae00ab1b6fa8733'; API_KEY = 'b6d34c3af91d62ab0ae00ab1b6fa8733';
API_SECRET = '2c631802c2285d5d5d1502462fe42a2b'; API_SECRET = '2c631802c2285d5d5d1502462fe42a2b';
var fmcache; var fmcache;
var lastfm; var lastfm;
$(window).load(function () {
$(window).load(function() {
// create a Cache object // create a Cache object
fmcache = new LastFMCache(); fmcache = new LastFMCache();
// create a LastFM object // create a LastFM object
@ -20,42 +19,40 @@ $(window).load(function() {
}); });
}); });
function getCover(album, images, size) { function getCover(album, images, size) {
var defUrl = 'images/default_cover.png'; var defUrl = 'images/default_cover.png';
$(images).attr('src', defUrl); $(images).attr('src', defUrl);
if (!album) { if (!album) {
return; return;
} }
var albumname = album.name || ''; var albumname = album.name || '';
var artistname = ''; var artistname = '';
if ( album.artists && (album.artists.length > 0) ) { if ( album.artists && (album.artists.length > 0) ) {
artistname = album.artists[0].name; artistname = album.artists[0].name;
} }
// console.log(album, images); if (album.images && (album.images.length > 0) ) {
if (album.images && (album.images.length > 0) ) { $(images).attr('src', album.images[0]);
$(images).attr('src', album.images[0]); } else {
} else { lastfm.album.getInfo( {artist: artistname, album: albumname},
lastfm.album.getInfo( {artist: artistname, album: albumname}, { success: function(data){
{ success: function(data){ for (var i = 0; i < data.album.image.length; i++) {
for (var i = 0; i < data.album.image.length; i++) { if ( data.album.image[i]['size'] == size) {
if ( data.album.image[i]['size'] == size) { $(images).attr('src', data.album.image[i]['#text'] || defUrl);
$(images).attr('src', data.album.image[i]['#text'] || defUrl);
}
} }
} }
}); }
});
} }
} }
function getArtistImage(nwartist, image, size) { function getArtistImage(nwartist, image, size) {
var defUrl = 'images/user_24x32.png'; var defUrl = 'images/user_24x32.png';
lastfm.artist.getInfo({artist: nwartist}, {success: function(data){ lastfm.artist.getInfo({artist: nwartist}, {success: function(data){
for (var i = 0; i < data.artist.image.length; i++) { for (var i = 0; i < data.artist.image.length; i++) {
if ( data.artist.image[i]['size'] == size) { if ( data.artist.image[i]['size'] == size) {
$(image).attr('src', data.artist.image[i]['#text'] || defUrl); $(image).attr('src', data.artist.image[i]['#text'] || defUrl);
}
} }
}}); }
}});
} }

31
mopidy_musicbox_webclient/static/js/library.js
View File

@ -30,7 +30,7 @@ function initSearch() {
$("#searchresults").hide(); $("#searchresults").hide();
if (searchService != 'all') { if (searchService != 'all') {
mopidy.library.search({any:[value]}, [searchService + ':']).then(processSearchResults, console.error); mopidy.library.search({'query': {any:[value]}, 'uris': [searchService + ':']}).then(processSearchResults, console.error);
} else { } else {
mopidy.getUriSchemes().then(function (schemes) { mopidy.getUriSchemes().then(function (schemes) {
var query = {}, var query = {},
@ -48,7 +48,7 @@ function initSearch() {
} else { } else {
query = {any: [value]}; query = {any: [value]};
} }
mopidy.library.search(query, uris).then(processSearchResults, console.error); mopidy.library.search({'query': query, 'uris': uris}).then(processSearchResults, console.error);
}); });
} }
} }
@ -79,15 +79,6 @@ function processSearchResults(resultArr) {
var results = {'tracks': [], 'artists': [], 'albums': []}; var results = {'tracks': [], 'artists': [], 'albums': []};
var j, emptyResult = true; var j, emptyResult = true;
/* for (var i = 0; i < resultArr.length; ++i) {
for (var prop in results) {
if (resultArr[i][prop] && resultArr[i][prop].length) {
results[prop] = results[prop].concat(resultArr[i][prop]);
emptyResult = false;
}
}
}
*/
for (var i = 0; i < resultArr.length; i++) { for (var i = 0; i < resultArr.length; i++) {
if (resultArr[i].tracks) { if (resultArr[i].tracks) {
for (j = 0; j < resultArr[i].tracks.length; j++) { for (j = 0; j < resultArr[i].tracks.length; j++) {
@ -109,10 +100,6 @@ function processSearchResults(resultArr) {
} }
} }
// console.log(resultArr, results);
customTracklists[URI_SCHEME+':trackresultscache'] = results.tracks; customTracklists[URI_SCHEME+':trackresultscache'] = results.tracks;
if (emptyResult) { if (emptyResult) {
@ -196,7 +183,6 @@ function processSearchResults(resultArr) {
$('#expandsearch').show(); $('#expandsearch').show();
// Track results // Track results
// playlisttotable(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache');
resultsToTables(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache'); resultsToTables(results.tracks, SEARCH_TRACK_TABLE, URI_SCHEME+':trackresultscache');
showLoading(false); showLoading(false);
@ -225,7 +211,7 @@ function getBrowseDir(rootdir) {
} else { } else {
browseStack.push(rootdir); browseStack.push(rootdir);
} }
mopidy.library.browse(rootdir).then(processBrowseDir, console.error); mopidy.library.browse({'uri': rootdir}).then(processBrowseDir, console.error);
} }
function getCurrentPlaylist() { function getCurrentPlaylist() {
@ -261,7 +247,6 @@ function showTracklist(uri) {
$(this).addClass('playlistactive'); $(this).addClass('playlistactive');
} }
}); });
// scrollToTracklist();
return false; return false;
} }
@ -274,12 +259,11 @@ function showArtist(nwuri) {
$('#popupTracks').popup('close'); $('#popupTracks').popup('close');
$('#controlsmodal').popup('close'); $('#controlsmodal').popup('close');
$(ARTIST_TABLE).empty(); $(ARTIST_TABLE).empty();
//fill from cache
// var pl = getTracksFromUri(nwuri);
//TODO cache //TODO cache
$('#h_artistname').html(''); $('#h_artistname').html('');
showLoading(true); showLoading(true);
mopidy.library.lookup(nwuri).then(function(resultArr) { mopidy.library.lookup({'uris': [nwuri]}).then(function(resultArr) {
resultArr.uri = nwuri; resultArr.uri = nwuri;
processArtistResults(resultArr); processArtistResults(resultArr);
}, console.error); }, console.error);
@ -304,16 +288,15 @@ function showAlbum(uri) {
$('#coverpopupalbumname').html(albumname); $('#coverpopupalbumname').html(albumname);
$('#coverpopupartist').html(artistname); $('#coverpopupartist').html(artistname);
showLoading(false); showLoading(false);
mopidy.library.lookup(uri).then(function(resultArr) { mopidy.library.lookup({'uris': [uri]}).then(function(resultArr) {
resultArr.uri = uri; resultArr.uri = uri;
processAlbumResults(resultArr); processAlbumResults(resultArr);
}, console.error); }, console.error);
// getCover(pl, '#albumviewcover, #coverpopupimage', 'extralarge');
} else { } else {
showLoading(true); showLoading(true);
$('#h_albumname').html(''); $('#h_albumname').html('');
$('#h_albumartist').html(''); $('#h_albumartist').html('');
mopidy.library.lookup(uri).then(function(resultArr) { mopidy.library.lookup({'uris': [uri]}).then(function(resultArr) {
resultArr.uri = uri; resultArr.uri = uri;
processAlbumResults(resultArr); processAlbumResults(resultArr);
}, console.error); }, console.error);

12
mopidy_musicbox_webclient/static/js/process_ws.js
View File

@ -118,7 +118,7 @@ function processBrowseDir(resultArr) {
iconClass = getMediaClass(resultArr[i].uri); iconClass = getMediaClass(resultArr[i].uri);
if (resultArr[i].type == 'track') { if (resultArr[i].type == 'track') {
//console.log(resultArr[i]); //console.log(resultArr[i]);
mopidy.library.lookup(resultArr[i].uri).then(function (resultArr) { mopidy.library.lookup({'uris': [resultArr[i].uri]}).then(function (resultArr) {
popupData[resultArr[0].uri] = resultArr[0]; popupData[resultArr[0].uri] = resultArr[0];
browseTracks.push(resultArr[0]); browseTracks.push(resultArr[0]);
}, console.error); }, console.error);
@ -139,14 +139,6 @@ function processBrowseDir(resultArr) {
$('#browselist').html(child); $('#browselist').html(child);
if (browseStack.length > 0 ) { if (browseStack.length > 0 ) {
/* child = '';
for (var i = 0; i < browseStack.length; i++) {
child += browseStack[i] + ' / ';
}
child = getMediaHuman(browseStack[0]);
iconClass = getMediaClass(browseStack[0]);
*/
child = getMediaHuman(resultArr[0].uri); child = getMediaHuman(resultArr[0].uri);
iconClass = getMediaClass(resultArr[0].uri); iconClass = getMediaClass(resultArr[0].uri);
$('#browsepath').html('<i class="' + iconClass + '"></i> ' + child); $('#browsepath').html('<i class="' + iconClass + '"></i> ' + child);
@ -199,7 +191,7 @@ function processPlaylistItems(resultDict) {
for (i = 0; i < resultDict.items.length; i++) { for (i = 0; i < resultDict.items.length; i++) {
trackUris.push(resultDict.items[i].uri); trackUris.push(resultDict.items[i].uri);
} }
return mopidy.library.lookup(null, trackUris).then(function(tracks) { return mopidy.library.lookup({'uris': trackUris}).then(function(tracks) {
// Transform from dict to list and cache result // Transform from dict to list and cache result
var newplaylisturi = resultDict.uri; var newplaylisturi = resultDict.uri;
playlists[newplaylisturi] = {'uri':newplaylisturi, 'tracks':[]}; playlists[newplaylisturi] = {'uri':newplaylisturi, 'tracks':[]};

18
mopidy_musicbox_webclient/static/js/streamuris.js
View File

@ -6,12 +6,12 @@
var streamUris = []; var streamUris = [];
//fill with defaults //fill with defaults
streamUris.push(['NPR 24', 'http://nprdmp.ic.llnwd.net/stream/nprdmp_live01_mp3']); streamUris.push(['NPR 24', 'http://nprdmp.ic.llnwd.net/stream/nprdmp_live01_mp3']);
streamUris.push(['3FM Dutch', 'http://icecast.omroep.nl/3fm-bb-mp3']); streamUris.push(['3FM Dutch', 'http://icecast.omroep.nl/3fm-bb-mp3']);
streamUris.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']); streamUris.push(['BBC WorldService', 'http://vprbbc.streamguys.net:8000/vprbbc24.mp3']);
streamUris.push(['Arrow Jazz', 'http://81.173.3.132:8082']); streamUris.push(['Arrow Jazz', 'http://81.173.3.132:8082']);
streamUris.push(['Queen Live Aid at Wembley (YouTube)', 'yt:http://www.youtube.com/watch?v=eQsM6u0a038']); streamUris.push(['Queen Live Aid at Wembley (YouTube)', 'yt:http://www.youtube.com/watch?v=eQsM6u0a038']);
streamUris.push(['Groove Salad - Soma FM', 'http://somafm.com/groovesalad.pls']); streamUris.push(['Groove Salad - Soma FM', 'http://somafm.com/groovesalad.pls']);
streamUris.push(['Kiss FM Berlin', 'http://stream.kissfm.de/kissfm/mp3-128/internetradio/']); streamUris.push(['Kiss FM Berlin', 'http://stream.kissfm.de/kissfm/mp3-128/internetradio/']);
streamUris.push(['Muse - Newborn (SoundCloud)', 'sc:https://soundcloud.com/muse/01-new-born']); streamUris.push(['Muse - Newborn (SoundCloud)', 'sc:https://soundcloud.com/muse/01-new-born']);
streamUris.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']); streamUris.push(['Pinguin Radio', 'http://pr320.pinguinradio.com/listen.pls']);