-
+
@@ -169,7 +167,7 @@
-
- - Play + Play
-
Play Track Next
@@ -224,11 +222,10 @@
-
-
+
+ ++ + +
Alarm Clock
+-Settings
+-@@ -304,31 +307,34 @@System
-
-
-
+
-
Browse
- +Browse
+
-
-
+
Search
+ +
+
-
-
+
+
-
-
-
-
-
- Artists
-
-
+
+
+
+
-
+
- Artists
-
-
-
-
-
- Albums
-
-
+
+
-
+
+ Tracks
-
+
+
+
+ Albums
+
+
+
+
Tracks
+Streams
-
-
-
- 
-
+
-
+
-
-
-
-
@@ -479,15 +474,12 @@
-
-
-
diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js
index 7353dfa..6c71640 100644
--- a/mopidy_musicbox_webclient/static/js/controls.js
+++ b/mopidy_musicbox_webclient/static/js/controls.js
@@ -1,162 +1,113 @@
-/********************************************************
- * play tracks from a browse list
- *********************************************************/
-function playBrowsedTracks(addtoqueue, trackid) {
-
- //stop directly, for user feedback.
- if (addtoqueue == PLAY_ALL) {
- mopidy.playback.stop();
- mopidy.tracklist.clear();
- }
+/***********************************
+ * play tracks from a browse list *
+ ***********************************/
+function playBrowsedTracks(action, trackIndex) {
$('#popupBrowse').popup('close');
toast('Loading...');
- trackid = typeof trackid !== 'undefined' ? trackid : $('#popupBrowse').data("track");
-
- var selected = 0, counter = 0;
-
- var isStream = isStreamUri(trackid);
- //only add one uri for dirble, tunein; otherwise add all tracks
- if (isStream) {
- mopidy.tracklist.add(null, null, trackid);
- } else {
- switch (addtoqueue) {
- case PLAY_NOW:
- case PLAY_NEXT:
- //find track that is playing
- for (var playing = 0; playing < currentplaylist.length; playing++) {
- if (currentplaylist[playing].uri == songdata.uri) {
- break;
- }
- }
- mopidy.tracklist.add(null, playing + 1, trackid);
- break;
- case ADD_THIS_BOTTOM:
- mopidy.tracklist.add(null, null, trackid);
- break;
- case ADD_ALL_BOTTOM:
- case PLAY_ALL:
- //add selected item to the playlist
- $('.browsetrack').each(function() {
- if (this.id == trackid) {
- selected = counter;
- }
- mopidy.tracklist.add(null, null, this.id);
- counter++;
- });
- break;
- default:
- break;
- }
-
+ if (typeof trackIndex === 'undefined') {
+ trackIndex = $('#popupBrowse').data("tlid");
}
-
- //play selected item
- if (addtoqueue == PLAY_ALL) {
- mopidy.playback.stop();
- for (var i = 0; i <= selected; i++) {
- mopidy.playback.next();
+ if (action == PLAY_ALL) {
+ mopidy.tracklist.clear();
+ // Default for radio streams is to just add the selected URI.
+ if (isStreamUri(browseTracks[trackIndex].uri)) {
+ action = PLAY_NOW;
}
- mopidy.playback.play(); //tracks[selected]);
- } else if (addtoqueue == PLAY_NOW) {
- mopidy.playback.stop();
- mopidy.playback.next();
- mopidy.playback.play();
}
-
- //add all items, but selected to the playlist
- selected = 0;
- counter = 0
- /* if(!isStream) {
- $('.browsetrack').each(function() {
- //do not add selected song again
- if (this.id == trackid) {
- selected = counter;
- } else {
- mopidy.tracklist.add(null, counter, this.id);
- }
- counter++;
- } );
- }
-*/
+ var trackUris = [];
+ switch (action) {
+ case PLAY_NOW:
+ case PLAY_NEXT:
+ case ADD_THIS_BOTTOM:
+ trackUris.push(browseTracks[trackIndex].uri);
+ break;
+ case PLAY_ALL:
+ case ADD_ALL_BOTTOM:
+ trackUris = getUris(browseTracks);
+ break;
+ default:
+ break;
+ }
+ var maybePlay = function(tlTracks) {
+ if (action === PLAY_NOW || action === PLAY_ALL) {
+ var playIndex = (action === PLAY_ALL) ? trackIndex : 0;
+ mopidy.playback.play({'tl_track': tlTracks[playIndex]});
+ }
+ };
+
+ switch (action) {
+ case PLAY_NOW:
+ case PLAY_NEXT:
+ mopidy.tracklist.index().then(function (currentIndex) {
+ mopidy.tracklist.add({'at_position': currentIndex + 1, 'uris': trackUris}).then(maybePlay);
+ });
+ break;
+ case ADD_THIS_BOTTOM:
+ case ADD_ALL_BOTTOM:
+ case PLAY_ALL:
+ mopidy.tracklist.add({'uris': trackUris}).then(maybePlay);
+ break;
+ default:
+ break;
+ }
return false;
}
-
-/********************************************************
- * play an uri from a tracklist
- *********************************************************/
-function playTrack(addtoqueue) {
+/*********************************
+ * play an uri from a tracklist *
+ *********************************/
+function playTrack(action) {
var hash = document.location.hash.split('?');
var divid = hash[0].substr(1);
- if (!addtoqueue) {
- addtoqueue = PLAY_NOW;
- }
-
- // console.log(addtoqueue, divid);
-
- //stop directly, for user feedback. If searchresults, also clear queue
- if (!addtoqueue || ((addtoqueue == PLAY_NOW) && (divid == 'search'))) {
- mopidy.playback.stop();
- mopidy.tracklist.clear();
+ // Search page default click behaviour adds and plays selected track only.
+ if (action == PLAY_NOW && divid == 'search') {
+ action = PLAY_NOW_SEARCH;
}
+
$('#popupTracks').popup('close');
$('#controlspopup').popup('close');
toast('Loading...');
playlisturi = $('#popupTracks').data("list");
-
uri = $('#popupTracks').data("track");
- var trackslist = new Array();
- var track, tracksbefore, tracksafter;
- var tracks = getTracksFromUri(playlisturi);
-
+ var trackUris = getTracksFromUri(playlisturi);
//find track that was selected
- for (var selected = 0; selected < tracks.length; selected++) {
- if (tracks[selected].uri == uri) {
+ for (var selected = 0; selected < trackUris.length; selected++) {
+ if (trackUris[selected] == uri) {
break;
}
}
-
- //find track that is playing
- for (var playing = 0; playing < currentplaylist.length; playing++) {
- if (currentplaylist[playing].uri == songdata.uri) {
- break;
- }
- }
-
- //switch popup options
- switch (addtoqueue) {
- case PLAY_NOW:
- if (divid == 'search') {
- mopidy.tracklist.add(tracks.slice(selected, selected + 1));
- mopidy.playback.play();
- return false;
- }
+ switch (action) {
case ADD_THIS_BOTTOM:
- mopidy.tracklist.add(tracks.slice(selected, selected + 1));
- return false;
case PLAY_NEXT:
- mopidy.tracklist.add(tracks.slice(selected, selected + 1), playing + 1);
- return false;
+ case PLAY_NOW_SEARCH:
+ trackUris = [trackUris[selected]];
+ selected = 0;
+ }
+ switch (action) {
+ case PLAY_NOW:
+ case PLAY_NOW_SEARCH:
+ mopidy.tracklist.clear().then(
+ mopidy.tracklist.add({'uris': trackUris}).then(
+ function(tlTracks) {
+ mopidy.playback.play({'tl_track': tlTracks[selected]})
+ }
+ )
+ );
+ break;
+ case PLAY_NEXT:
+ mopidy.tracklist.index().then(function(currentIndex) {
+ mopidy.tracklist.add({'at_position': currentIndex + 1, 'uris': trackUris});
+ });
+ break;
+ case ADD_THIS_BOTTOM:
case ADD_ALL_BOTTOM:
- mopidy.tracklist.add(tracks);
- return false;
+ mopidy.tracklist.add({'uris': trackUris});
+ break;
}
- // PLAY_NOW, play the selected track
- // mopidy.tracklist.add(null, null, uri); //tracks);
- mopidy.tracklist.add(tracks);
-
- if (!addtoqueue) {
- mopidy.playback.stop();
- for (var i = 0; i <= selected; i++) {
- mopidy.playback.next();
- }
- mopidy.playback.play();
- }
-
return false;
}
@@ -167,20 +118,20 @@ function playTrack(addtoqueue) {
*/
function playTrackByUri(track_uri, playlist_uri) {
function findAndPlayTrack(tltracks) {
-// console.log('fa', tltracks, track_uri);
- if (tltracks == []) { return;}
- // Find track that was selected
- for (var selected = 0; selected < tltracks.length; selected++) {
- if (tltracks[selected].track.uri == track_uri) {
- mopidy.playback.play(tltracks[selected]);
- return;
+ if (tltracks.length > 0) {
+ // Find track that was selected
+ for (var selected = 0; selected < tltracks.length; selected++) {
+ if (tltracks[selected].track.uri == track_uri) {
+ mopidy.playback.play({'tl_track': tltracks[selected]});
+ return;
+ }
}
}
- console.log('Failed to play selected track ', track_uri);
+ console.error('Failed to find and play selected track ', track_uri);
+ return;
}
// Stop directly, for user feedback
- mopidy.playback.stop();
mopidy.tracklist.clear();
//this is deprecated, remove when popuptracks is removed completly
@@ -190,18 +141,15 @@ function playTrackByUri(track_uri, playlist_uri) {
toast('Loading...');
- var func;
- func = mopidy.tracklist.add(null, null, playlist_uri);
- func.then(
- function(tltracks) {
- //check if tltracks is filled, some backends (gmusic) do not support adding by uri, it seems
- if (tltracks.length == 0) {
- var tracks = getTracksFromUri(playlist_uri);
- mopidy.tracklist.add(tracks).then(findAndPlayTrack);
- }
+ mopidy.tracklist.add({'uris': [playlist_uri]}).then(function(tltracks) {
+ // Can fail for all sorts of reasons. If so, just add individually.
+ if (tltracks.length == 0) {
+ var trackUris = getTracksFromUri(playlist_uri, false);
+ mopidy.tracklist.add({'uris': trackUris}).then(findAndPlayTrack);
+ } else {
findAndPlayTrack(tltracks);
}
- ).then(getCurrentPlaylist()); // Updates some state
+ });
return false;
}
@@ -212,25 +160,25 @@ function playTrackByUri(track_uri, playlist_uri) {
/***
* Plays a Track from a Playlist.
* @param uri
- * @param playlisturi
+ * @param tlid
* @returns {boolean}
*/
-function playTrackQueueByUri(uri, playlisturi) {
- // console.log('playquuri');
+function playTrackQueueByTlid(uri, tlid) {
//stop directly, for user feedback
mopidy.playback.stop();
$('#popupQueue').popup('close');
toast('Loading...');
+ tlid = parseInt(tlid);
mopidy.tracklist.filter({
- 'uri': [uri]
+ 'tlid': [tlid]
}).then(
function(tltracks) {
if (tltracks.length > 0) {
- mopidy.playback.play(tltracks[0]);
+ mopidy.playback.play({'tl_track': tltracks[0]});
return;
}
- console.log('Failed to play selected track ', uri);
+ console.log('Failed to play selected track ', tlid);
}
);
return false;
@@ -241,31 +189,21 @@ function playTrackQueueByUri(uri, playlisturi) {
* @returns {boolean}
*/
function playTrackQueue() {
- // console.log('playqu');
- playlisturi = $('#popupQueue').data("list");
uri = $('#popupQueue').data("track");
- return playTrackQueueByUri(uri, playlisturi);
+ tlid = $('#popupQueue').data("tlid");
+ return playTrackQueueByTlid(uri, tlid);
}
-/********************************************************
- * remove a track from the queue
- *********************************************************/
+/***********************************
+ * remove a track from the queue *
+ ***********************************/
function removeTrack() {
$('#popupQueue').popup('close');
toast('Deleting...');
- uri = $('#popupQueue').data("track");
- console.log(uri);
-
- for (var i = 0; i < currentplaylist.length; i++) {
- if (currentplaylist[i].uri == uri) {
- break;
- }
- }
- var track = {};
- track.uri = [currentplaylist[i].uri];
- mopidy.tracklist.remove({'uri':track.uri});
- // console.log(currentplaylist[i].uri);
+ tlid = parseInt($('#popupQueue').data("tlid"));
+ console.log(tlid);
+ mopidy.tracklist.remove({'tlid': [tlid]});
}
function clearQueue() {
@@ -276,9 +214,38 @@ function clearQueue() {
return false;
}
-/**********************
- * Buttons
- */
+function saveQueue() {
+ mopidy.tracklist.getTracks().then(function(tracks) {
+ if (tracks.length > 0) {
+ var plname = window.prompt("Playlist name:", "").trim();
+ if (plname != null && plname != "") {
+ mopidy.playlists.filter({"name": plname}).then(function(existing) {
+ var exists = false;
+ for (var i = 0; i < existing.length; i++) {
+ exists = exists || existing[i].uri.indexOf("m3u:") == 0 || existing[i].uri.indexOf("local:") == 0;
+ }
+ if (!exists || window.confirm("Overwrite existing playlist \"" + plname + "\"?")) {
+ mopidy.playlists.create({'name': plname, 'uri_scheme': "local"}).then(function(playlist) {
+ playlist.tracks = tracks;
+ mopidy.playlists.save({'playlist': playlist}).then();
+ getPlaylists();
+ });
+ }
+ });
+ }
+ }
+ });
+ return false;
+}
+
+function refreshPlaylists() {
+ mopidy.playlists.refresh();
+ return false;
+}
+
+/*************
+ * Buttons *
+ *************/
function doShuffle() {
mopidy.playback.stop();
@@ -289,15 +256,15 @@ function doShuffle() {
/* Toggle state of play button */
function setPlayState(nwplay) {
if (nwplay) {
- $("#playimg").attr('src', 'images/icons/pause_32x32.png');
- $("#playimg").attr('title', 'Pause');
$("#btplayNowPlaying >i").removeClass('fa-play').addClass('fa-pause');
$("#btplayNowPlaying").attr('title', 'Pause');
+ $("#btplay >i").removeClass('fa-play').addClass('fa-pause');
+ $("#btplay").attr('title', 'Pause');
} else {
- $("#playimg").attr('src', 'images/icons/play_alt_32x32.png');
- $("#playimg").attr('title', 'Play');
$("#btplayNowPlaying >i").removeClass('fa-pause').addClass('fa-play');
$("#btplayNowPlaying").attr('title', 'Play');
+ $("#btplay >i").removeClass('fa-pause').addClass('fa-play');
+ $("#btplay").attr('title', 'Play');
}
play = nwplay;
}
@@ -308,10 +275,10 @@ function doPlay() {
if (!play) {
mopidy.playback.play();
} else {
- if(isStreamUri(songdata.uri)) {
+ if(isStreamUri(songdata.track.uri)) {
mopidy.playback.stop();
} else {
- mopidy.playback.pause();
+ mopidy.playback.pause();
}
}
setPlayState(!play);
@@ -332,10 +299,9 @@ function backbt() {
return false;
}
-/***************
- * Options
- ***************/
-
+/*************
+ * Options *
+ *************/
function setTracklistOption(name, new_value) {
if (!new_value) {
$("#"+name+"bt").attr('style', 'color:#2489ce');
@@ -370,27 +336,26 @@ function setSingle(nwsingle) {
}
function doRandom() {
- mopidy.tracklist.setRandom(!random).then();
+ mopidy.tracklist.setRandom({'value': !random}).then();
}
function doRepeat() {
- mopidy.tracklist.setRepeat(!repeat).then();
+ mopidy.tracklist.setRepeat({'value': !repeat}).then();
}
function doConsume() {
- mopidy.tracklist.setConsume(!consume).then();
+ mopidy.tracklist.setConsume({'value': !consume}).then();
}
function doSingle() {
- mopidy.tracklist.setSingle(!single).then();
+ mopidy.tracklist.setSingle({'value': !single}).then();
}
-/*********************
- * Track Slider
- * Use a timer to prevent looping of commands
- *********************/
-
+/***********************************************
+ * Track Slider *
+ * Use a timer to prevent looping of commands *
+ ***********************************************/
function doSeekPos(value) {
var val = $("#trackslider").val();
newposition = Math.round(val);
@@ -406,10 +371,7 @@ function doSeekPos(value) {
function triggerPos() {
if (mopidy) {
posChanging = true;
- // mopidy.playback.pause();
- // console.log(newposition);
- mopidy.playback.seek(newposition);
- // mopidy.playback.resume();
+ mopidy.playback.seek({'time_position': newposition});
resumePosTimer();
posChanging = false;
}
@@ -431,54 +393,51 @@ function setPosition(pos) {
$("#songelapsed").html(timeFromSeconds(currentposition / 1000));
}
-/********************
- * Volume slider
- * Use a timer to prevent looping of commands
- */
+/***********************************************
+ * Volume slider *
+ * Use a timer to prevent looping of commands *
+ ***********************************************/
function setVolume(value) {
- var oldval = initgui;
- initgui = true;
- $("#volumeslider").val(value).slider('refresh');
- initgui = oldval;
+ if ($("#volumeslider").val() != value) {
+ $("#volumeslider").val(value).slider('refresh');
+ }
}
function doVolume(value) {
- if (!initgui) {
- volumeChanging = value;
- clearInterval(volumeTimer);
- volumeTimer = setTimeout(triggerVolume, 500);
- }
+ volumeChanging = value;
+ clearInterval(volumeTimer);
+ volumeTimer = setTimeout(triggerVolume, 500);
}
function triggerVolume() {
- mopidy.playback.setVolume(parseInt(volumeChanging));
+ mopidy.playback.setVolume({'volume': parseInt(volumeChanging)});
volumeChanging = 0;
}
-function doMute() {
- //only emit the event, not the status
- if (muteVolume == -1) {
- $("#mutebt").attr('src', 'images/icons/volume_mute_24x18.png');
- muteVolume = currentVolume;
- mopidy.playback.setVolume(0).then();
- } else {
- $("#mutebt").attr('src', 'images/icons/volume_24x18.png');
- mopidy.playback.setVolume(muteVolume).then();
- muteVolume = -1;
+function setMute(nwmute) {
+ if (mute != nwmute) {
+ mute = nwmute;
+ if (mute) {
+ $("#mutebt").attr('class', 'fa fa-volume-off');
+ } else {
+ $("#mutebt").attr('class', 'fa fa-volume-up');
+ }
}
-
}
-/*******
- * Track position timer
- */
+function doMute() {
+ mopidy.mixer.setMute({'mute': !mute});
+}
+
+/**************************
+ * Track position timer *
+ **************************/
//timer function to update interface
function updatePosTimer() {
currentposition += TRACK_TIMER;
setPosition(currentposition);
- // $("#songelapsed").html(timeFromSeconds(currentposition / 1000));
}
function resumePosTimer() {
@@ -498,9 +457,9 @@ function pausePosTimer() {
clearInterval(posTimer);
}
-/*********************************
- * Stream
- *********************************/
+/************
+ * Stream *
+ ************/
function streamPressed(key) {
if (key == 13) {
playStreamUri();
@@ -522,9 +481,9 @@ function playStreamUri(uri) {
mopidy.playback.stop();
//hide ios/android keyboard
document.activeElement.blur();
- $("input").blur();
clearQueue();
- mopidy.tracklist.add(null, null, nwuri);
+ $("input").blur();
+ mopidy.tracklist.add({'uris': [nwuri]});
mopidy.playback.play();
} else {
toast('No valid url!');
@@ -532,71 +491,179 @@ function playStreamUri(uri) {
return false;
}
-function saveStreamUri(nwuri) {
- var i = 0;
- var name = $('#streamnameinput').val().trim();
- var uri = nwuri || $('#streamuriinput').val().trim();
- var service = $('#selectstreamservice').val();
- if (service) {
- uri = serviceupdateStreamUris + ':' + uri;
- }
- toast('Adding stream ' + uri, 500);
- //add stream to list and check for doubles and add no more than 100
- for (var key in streamUris) {
- rs = streamUris[key];
- if (i > 100) {
- delete streamUris[key];
- continue;
+function getCurrentlyPlaying() {
+ $('#streamuriinput').val(songdata.track.uri);
+ var name = songdata.track.name;
+ if (songdata.track.artists) {
+ var artistStr = artistsToString(songdata.track.artists);
+ if (artistStr) {
+ name = artistStr + ' - ' + name;
}
- i++;
}
- streamUris.unshift([name, uri]);
- $.cookie.json = true;
- $.cookie('streamUris', streamUris);
- updateStreamUris();
- return false;
+ $('#streamnameinput').val(name);
+ return true;
}
-function deleteStreamUri(uri) {
- var i = 0;
- for (var key in streamUris) {
- rs = streamUris[key];
- if (rs && rs[1] == uri) {
- if (confirm("About to remove " + rs[0] + ". Sure?")) {
- delete streamUris[key];
+function getUriSchemes() {
+ uriSchemes = {};
+ return mopidy.getUriSchemes().then(function(schemes) {
+ for (var i = 0; i < schemes.length; i++) {
+ uriSchemes[schemes[i].toLowerCase()] = true;
+ }
+ });
+}
+
+function getPlaylistByName(name, scheme, create) {
+ var uri_scheme = scheme || '';
+ var uri = '';
+ if (uri_scheme && !uriSchemes[uri_scheme]) {
+ return Mopidy.when(false);
+ }
+ return mopidy.playlists.asList().catch(console.error.bind(console)).then(function(plists) {
+ for (var i = 0; i < plists.length; i++) {
+ if ((plists[i].name === name) && (uri_scheme === '' || getScheme(plists[i].uri) === uri_scheme)) {
+ return plists[i];
}
}
- }
- $.cookie.json = true;
- $.cookie('streamUris', streamUris);
- updateStreamUris();
-
- return false;
-}
-
-function updateStreamUris() {
- var tmp = '';
- $('#streamuristable').empty();
- var child = '';
- for (var key in streamUris) {
- var rs = streamUris[key];
- if (rs) {
- name = rs[0] || rs[1];
- child = '' +
- '' +
- ' ';
- child += ' ';
- tmp += child;
+ if (create) {
+ return mopidy.playlists.create({'name': name, 'uri_scheme': uri_scheme}).done(function(plist) {
+ console.log("Created playlist '%s'", plist.name);
+ return plist;
+ });
}
- }
- $('#streamuristable').html(tmp);
+ console.log("Can't find playist '%s", name);
+ return Mopidy.when(false);
+ });
}
-function initStreams() {
+function getPlaylistFull(uri) {
+ return mopidy.playlists.lookup({'uri': uri}).then(function(pl) {
+ playlists[uri] = pl;
+ return pl;
+ });
+}
+
+function getFavourites() {
+ return getPlaylistByName(STREAMS_PLAYLIST_NAME,
+ STREAMS_PLAYLIST_SCHEME,
+ true).then(function(playlist) {
+ if (playlist) {
+ return getPlaylistFull(playlist.uri);
+ }
+ return Mopidy.when(false);
+ });
+}
+
+function addToFavourites(newTracks) {
+ getFavourites().catch(console.error.bind(console)).then(function(favourites) {
+ if (favourites) {
+ if (favourites.tracks) {
+ Array.prototype.push.apply(favourites.tracks, newTracks)
+ } else {
+ favourites.tracks = newTracks;
+ }
+ mopidy.playlists.save({'playlist': favourites}).then(function(s) {
+ showFavourites();
+ });
+ }
+ });
+}
+
+function addFavourite(uri, name) {
+ var uri = uri || $('#streamuriinput').val().trim();
+ var name = name || $('#streamnameinput').val().trim();
+ mopidy.library.lookup({'uris': [uri]}).then(function(results) {
+ var newTracks = results[uri];
+ if (newTracks.length == 1) {
+ // TODO: Supporting adding an entire playlist?
+ if (name) {
+ newTracks[0].name = name; // User overrides name.
+ }
+ addToFavourites(newTracks);
+ } else {
+ if (newTracks.length == 0) {
+ console.log('No tracks to add');
+ } else {
+ console.log('Too many tracks (%d) to add', tracks.length);
+ }
+ }
+ });
+}
+
+function deleteFavourite(index) {
+ getFavourites().then(function(favourites) {
+ if (favourites && favourites.tracks && index < favourites.tracks.length) {
+ var name = favourites.tracks[index].name;
+ if (confirm("Are you sure you want to remove '" + name + "'?")) {
+ favourites.tracks.splice(index, 1);
+ mopidy.playlists.save({'playlist': favourites}).then(function(s) {
+ showFavourites();
+ });
+ }
+ }
+ });
+}
+
+function showFavourites() {
+ $('#streamuristable').empty();
+ getFavourites().then(function(favourites) {
+ if (!favourites) {
+ return;
+ }
+ var tmp = '';
+
+ $.cookie.json = true;
+ if ($.cookie('streamUris')) {
+ tmp = ''
+ }
+ if (favourites.tracks) {
+ var child = '';
+ for (var i = 0; i < favourites.tracks.length; i++) {
+ child = '' +
+ '' +
+ ' ';
+ child += ' ';
+ tmp += child;
+ }
+ }
+ $('#streamuristable').html(tmp);
+ });
+}
+
+// TODO: Remove this upgrade path in next major release.
+function upgradeStreamUrisToFavourites() {
+ toast('Converting streamUris...');
$.cookie.json = true;
- tmpRS = $.cookie('streamUris');
- streamUris = tmpRS || streamUris;
- updateStreamUris();
+ var streamUris = $.cookie('streamUris'); // Read the cookie.
+ if (streamUris) {
+ var uris = []; // Prepare a list of uris to lookup.
+ for (var key in streamUris) {
+ var rs = streamUris[key];
+ if (rs) {
+ uris.push(rs[1]);
+ }
+ }
+ mopidy.library.lookup({'uris': uris}).then(function(results) {
+ var tracks = []; // Prepare a list of tracks to add.
+ for (var key in streamUris) {
+ var rs = streamUris[key];
+ if (rs) {
+ var track = results[rs[1]][0];
+ if (track) {
+ track.name = rs[0] || track.name; // Use custom name if provided.
+ tracks.push(track);
+ } else {
+ console.log("Skipping unplayable streamUri " + rs[1]);
+ }
+ }
+ }
+ addToFavourites(tracks);
+ $.cookie('streamUris', null); // Delete the cookie now we're done.
+ console.log(tracks.length + " streamUris added to favourites");
+ });
+ } else {
+ console.log("No streamUris cookie found");
+ }
}
function haltSystem() {
diff --git a/mopidy_musicbox_webclient/static/js/functionsvars.js b/mopidy_musicbox_webclient/static/js/functionsvars.js
index 6d1f995..97bf743 100644
--- a/mopidy_musicbox_webclient/static/js/functionsvars.js
+++ b/mopidy_musicbox_webclient/static/js/functionsvars.js
@@ -4,12 +4,6 @@
* all kinds functions and vars
*/
-var baseurl = '/mopidy';
-var host = window.location.hostname;
-var port = window.location.port;
-var wsurl = host + ':' + port + baseurl
-var intv;
-var socket;
var mopidy;
//values for controls
@@ -19,7 +13,7 @@ var repeat;
var consume;
var single;
var currentVolume = -1;
-var muteVolume = -1;
+var mute;
var volumeChanging = false;
var posChanging = false;
@@ -34,19 +28,23 @@ var songlength = 0;
var artistshtml = '';
var artiststext = '';
var songname = '';
-var songdata = '';
+var songdata = {'track': {}, 'tlid': -1};
var newposition = 0;
var playlisttracksScroll;
var playlistslistScroll;
+var STREAMS_PLAYLIST_NAME = '[Radio Streams]';
+var STREAMS_PLAYLIST_SCHEME = 'm3u';
+var uriSchemes = {};
+
//array of cached playlists (not only user-playlists, also search, artist, album-playlists)
var playlists = {};
var currentplaylist;
-var customPlaylists = [];
var customTracklists = [];
var browseStack = [];
+var browseTracks = [];
var ua = navigator.userAgent,
isMobileSafari = /Mac/.test(ua) && /Mobile/.test(ua),
@@ -56,7 +54,6 @@ var ua = navigator.userAgent,
//constants
PROGRAM_NAME = 'MusicBox';
-//PROGRAM_NAME = 'Mopidy';
ARTIST_TABLE = '#artiststable';
ALBUM_TABLE = '#albumstable';
PLAYLIST_TABLE = '#playlisttracks';
@@ -66,11 +63,14 @@ SEARCH_ALBUM_TABLE = '#albumresulttable';
SEARCH_ARTIST_TABLE = '#artistresulttable';
SEARCH_TRACK_TABLE = '#trackresulttable';
+URI_SCHEME = 'mbw';
+
PLAY_NOW = 0;
PLAY_NEXT = 1;
ADD_THIS_BOTTOM = 2;
ADD_ALL_BOTTOM = 3;
PLAY_ALL = 4;
+PLAY_NOW_SEARCH = 5;
MAX_TABLEROWS = 50;
@@ -87,6 +87,7 @@ var uriClassList = [
['spotify', 'fa-spotify'],
['spotifytunigo', 'fa-spotify'],
['local', 'fa-file-sound-o'],
+ ['m3u', 'fa-file-sound-o'],
['podcast', 'fa-rss-square'],
['dirble', 'fa-microphone'],
['tunein', 'fa-headphones'],
@@ -105,6 +106,7 @@ var uriHumanList = [
['spotify', 'Spotify'],
['spotifytunigo', 'Spotify Browse'],
['local', 'Local Files'],
+ ['m3u', 'Local Playlists'],
['podcast', 'Podcasts'],
['dirble', 'Dirble'],
['tunein', 'TuneIn'],
@@ -117,11 +119,6 @@ var uriHumanList = [
['subsonic', 'Subsonic']
];
-var uriServiceDetectList = [
- ['youtube.com', 'yt'],
- ['soundcloud.com', 'sc']
-];
-
function scrollToTop() {
var divtop = 0;
$('body,html').animate({
@@ -130,11 +127,7 @@ function scrollToTop() {
}
function scrollToTracklist() {
- /* if (isMobileWebkit) {
- playlistslistScroll.refresh();
- }
-*/
- var divtop = $("#playlisttracksdiv").offset().top - 50;
+ var divtop = $("#playlisttracksdiv").offset().top - 120;
$('body,html').animate({
scrollTop: divtop
}, 250);
@@ -161,6 +154,20 @@ function getAlbum(pl) {
};
}
+function artistsToString(artists, max) {
+ var result = '';
+ max = max || 3;
+ for (var i = 0; i < artists.length && i < max; i++) {
+ if (artists[i].name) {
+ if (i > 0) {
+ result += ', ';
+ }
+ result += artists[i].name;
+ }
+ }
+ return result;
+}
+
/********************************************************
* break up results and put them in album tables
*********************************************************/
@@ -172,14 +179,14 @@ function albumTracksToTable(pl, target, uri) {
for (var i = 0; i < pl.length; i++) {
popupData[pl[i].uri] = pl[i];
liID = targetmin + '-' + pl[i].uri;
- tmp += renderSongLi(pl[i], liID, uri, 'playTrackByUri');
+ tmp += renderSongLi(pl[i], liID, uri);
};
tmp += '';
$(target).html(tmp);
$(target).attr('data', uri);
}
-function renderSongLi(song, liID, uri, playlistType) {
+function renderSongLi(song, liID, uri) {
var name;
if (!song.name || song.name == '') {
name = uri.split('/');
@@ -187,16 +194,29 @@ function renderSongLi(song, liID, uri, playlistType) {
} else {
name = song.name;
}
- // var iconClass = getMediaClass(liID.split('-')[1]);
songLi = '' +
- '' +
- '' +
- '' + '' +
- // ' ';
+ return songLi;
+}
- '';
+function renderQueueSongLi(song, liID, uri, tlid) {
+ var name;
+ if (!song.name || song.name == '') {
+ name = uri.split('/');
+ name = decodeURI(name[name.length - 1]);
+ } else {
+ name = song.name;
+ }
+ songLi = '' +
+ '' +
+ '' +
+ '' +
+ ' ';
return songLi;
}
@@ -204,15 +224,16 @@ function resultsToTables(results, target, uri) {
if (!results) {
return
}
- if (target == '#currenttable') {
- playlistType = 'playTrackQueueByUri';
- } else if (target == SEARCH_TRACK_TABLE) {
- playlistType = 'playTrackByUri';
- } else {
- playlistType = 'playTrackByUri';
+ var tlids = [];
+ if (target == CURRENT_PLAYLIST_TABLE) {
+ for (i = 0; i < results.length; i++) {
+ tlids[i] = results[i].tlid;
+ results[i] = results[i].track;
+ }
}
var newalbum = [];
+ var newtlids = [];
//keep a list of albums for retreiving of covers
var coversList = [];
var nextname = '';
@@ -228,7 +249,7 @@ function resultsToTables(results, target, uri) {
for (i = 0; i < length; i++) {
//create album if none extists
if (!results[i].album) {
- results[i].album = {};
+ results[i].album = {"__model__": "Album"};
}
//create album uri if there is none
if (!results[i].album.uri) {
@@ -247,6 +268,7 @@ function resultsToTables(results, target, uri) {
if (results[i].name.substring(0, 12) == '[unplayable]') continue;
newalbum.push(results[i]);
+ newtlids.push(tlids[i]);
nextname = '';
if ((i < length - 1) && results[i + 1].album && results[i + 1].album.name) {
nextname = results[i + 1].album.name;
@@ -254,6 +276,7 @@ function resultsToTables(results, target, uri) {
if (results[i].length == -1) {
html += ' ';
}
iconClass = getMediaClass(newalbum[0].uri);
- html += '' +
- '' +
- '' +
- '' +
- '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '';
html += '![]()
';
-
//hERE!
var liID = targetmin + '-' + newalbum[j].uri;
- html += renderSongLi(newalbum[j], liID, uri, playlistType);
-
- //html += '';
- //html += ' ';
+ if (target == CURRENT_PLAYLIST_TABLE) {
+ html += renderQueueSongLi(newalbum[j], liID, uri, newtlids[j]);
+ } else {
+ html += renderSongLi(newalbum[j], liID, uri);
+ }
}
newalbum = [];
+ newtlids = [];
if (results[i].album) {
coversList.push([results[i].album, i]);
}
@@ -336,7 +368,6 @@ function resultsToTables(results, target, uri) {
$(target).attr('data', uri);
//retreive albumcovers
for (i = 0; i < coversList.length; i++) {
- // console.log(coversList[i]);
getCover(coversList[i][0], target + '-cover-' + coversList[i][1], 'small');
}
}
@@ -354,7 +385,6 @@ function playlisttotable(pl, target, uri) {
child += '
' + name + '
' + favourites.tracks[i].name + '
' + name + '
' + - '' + name + '
' + - '' + + '' + + '' + + '' + + '' + name + '
' + + '' + name + '
' + + '' + results[i].name + ' [Stream]
' + newalbum[0].name + "
"; - /* '' + timeFromSeconds(newalbum[0].length / 1000) + ''; */ + var liID = targetmin + '-' + newalbum[0].uri; + if (target == CURRENT_PLAYLIST_TABLE) { + html += '
' + newalbum[0].name + "
"; + } else { + html += '
' + newalbum[0].name + "
"; + } + if (newalbum[0].artists) { for (j = 0; j < newalbum[0].artists.length; j++) { html += newalbum[0].artists[j].name; @@ -289,9 +321,9 @@ function resultsToTables(results, target, uri) { popupData[newalbum[0].uri] = newalbum[0]; newalbum = []; + newtlids = []; } else { //newalbum length if (results[i].album.uri && results[i].album.name) { - // iconClass = getMediaClass(results[i].album.uri); iconClass = getMediaClass(newalbum[0].uri); html += '
' + timeFromSeconds(newalbum[j].length / 1000) + '
' + newalbum[j].name + '
' + pl[i].name + "
"; child += ''; child += '' + timeFromSeconds(pl[i].length / 1000) + ''; - // for (var j = 0; j < pl[i].artists.length; j++) { if (pl[i].artists[j]) { child += pl[i].artists[j].name; @@ -376,21 +406,33 @@ function playlisttotable(pl, target, uri) { $(target).attr('data', uri); } -function getPlaylistFromUri(uri) { - if (playlists[uri]) { - return playlists[uri]; - } - if (customPlaylists[uri]) { - return customPlaylists[uri]; +function getPlaylistTracks(uri) { + if (playlists[uri] && playlists[uri].tracks) { + return Mopidy.when(playlists[uri].tracks); + } else { + showLoading(true); + return mopidy.playlists.getItems({'uri': uri}).then(function(refs) { + return processPlaylistItems({'uri': uri, 'items': refs}); + }, console.error); } } -function getTracksFromUri(uri) { - var pl = getPlaylistFromUri(uri); - if (pl) { - return pl.tracks; - } else if (customTracklists[uri]) { - return customTracklists[uri]; +function getUris(tracks) { + var results = []; + for (var i = 0; i < tracks.length; i++) { + results.push(tracks[i].uri); + } + return results; +} + +function getTracksFromUri(uri, full_track_data) { + var returnTracksOrUris = function(tracks) { + return (full_track_data || false) ? tracks : getUris(tracks); + } + if (customTracklists[uri]) { + return returnTracksOrUris(customTracklists[uri]); + } else if (playlists[uri] && playlists[uri].tracks) { + return returnTracksOrUris(playlists[uri].tracks); } return []; } @@ -404,7 +446,6 @@ function timeFromSeconds(length) { return ((h > 0 ? h + ":" : "") + (m > 0 ? (h > 0 && m < 10 ? "0" : "") + m + ":" : "0:") + (s < 10 ? "0" : "") + s); } - /******* Toast ***/ function toast(message, delay, textOnly) { textOnl = textOnly || false; @@ -423,9 +464,9 @@ function toast(message, delay, textOnly) { } } -/***************** - * Modal dialogs - *****************/ +/****************** + * Modal dialogs * + ******************/ function showLoading(on) { if (on) { $("body").css("cursor", "progress"); @@ -456,7 +497,6 @@ function showOffline(on) { // from http://dzone.com/snippets/validate-url-regexp function validUri(str) { var regexp = /^(mms|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/ - // return regexp.test(str) || isServiceUri(str); return regexp.test(str); } @@ -464,17 +504,20 @@ function validServiceUri(str) { return validUri(str) || isServiceUri(str); } +function getScheme(uri) { + return uri.split(':')[0].toLowerCase(); +} + function isStreamUri(uri) { - var uriSplit = uri.split(":"); var a = validUri(uri); - var b = radioExtensionsList.indexOf(uriSplit[0].toLowerCase()) >= 0; + var b = radioExtensionsList.indexOf(getScheme(uri)) >= 0; return a || b; } function getMediaClass(uri) { - var uriSplit = uri.split(":")[0].toLowerCase(); + var scheme = getScheme(uri); for (var i = 0; i < uriClassList.length; i++) { - if (uriSplit == uriClassList[i][0]) { + if (scheme == uriClassList[i][0]) { return "fa " + uriClassList[i][1]; } } @@ -482,9 +525,9 @@ function getMediaClass(uri) { } function getMediaHuman(uri) { - var uriSplit = uri.split(":")[0].toLowerCase(); + var scheme = getScheme(uri); for (var i = 0; i < uriHumanList.length; i++) { - if (uriSplit == uriHumanList[i][0]) { + if (scheme == uriHumanList[i][0]) { return uriHumanList[i][1]; } } @@ -492,19 +535,26 @@ function getMediaHuman(uri) { } function isServiceUri(uri) { - var uriSplit = uri.split(":")[0].toLowerCase(); - var retVal = false; - + var scheme = getScheme(uri); for (var i = 0; i < uriClassList.length; i++) { - if (uriSplit == uriClassList[i][0]) { - retVal = true; + if (scheme == uriClassList[i][0]) { + return true; } } - for (var i = 0; i < radioExtensionsList.length; i++) { - if (uriSplit == radioExtensionsList[i]) { - retVal = true; + if (scheme == radioExtensionsList[i]) { + return true; } } - return retVal; + return false; } + +function isFavouritesPlaylist(playlist) { + return (playlist.name == STREAMS_PLAYLIST_NAME && + getScheme(playlist.uri) == STREAMS_PLAYLIST_SCHEME); +} + +function isSpotifyStarredPlaylist(playlist) { + var starredRegex = /spotify:user:.*:starred/g; + return (starredRegex.test(playlist.uri) && playlist.name == 'Starred'); +} diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index 5990673..18b8706 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -4,7 +4,7 @@ * show- functions do both */ /******************** - * Song Info Sreen + * Song Info Sreen * ********************/ function resetSong() { if (!posChanging) { @@ -12,17 +12,21 @@ function resetSong() { setPlayState(false); setPosition(0); var data = new Object; - data.name = ''; - data.artists = ''; - data.length = 0; - data.uri = ' '; + data.tlid = -1; + data.track = new Object; + data.track.name = ''; + data.track.artists = ''; + data.track.length = 0; + data.track.uri = ' '; setSongInfo(data); } } function resizeMb() { - $("#infoname").html(songdata.name); + $("#infoname").html(songdata.track.name); + $("#infoname").truncate(); $("#infoartist").html(artiststext); + $("#infoartist").truncate(); if ($(window).width() <= 960) { // $('#playlisttracksdiv').hide(); @@ -69,78 +73,86 @@ function resizeMb() { */ } +function setSongTitle(title, refresh_ui) { + songdata.track.name = title; + $("#modalname").html(title); + if (refresh_ui) { + resizeMb(); + } +} + function setSongInfo(data) { // console.log(data, songdata); if (!data ) { return; } - if ( (data.uri == songdata.uri) ) { return;} - if (!data.name || data.name == '') { - var name = data.uri.split('/'); - data.name = decodeURI(name[name.length - 1]); + if (data.tlid == songdata.tlid) { return; } + if (!data.track.name || data.track.name == '') { + var name = data.track.uri.split('/'); + data.track.name = decodeURI(name[name.length - 1]); }; - updatePlayIcons(data.uri); + updatePlayIcons(data.track.uri, data.tlid); artistshtml = ''; artiststext = ''; - if (validUri(data.name)) { + if (validUri(data.track.name)) { for (var key in streamUris) { - rs = streamUris[key]; - if (rs && rs[1] == data.name) { - data.name = (rs[0] || rs[1]); - } - }; + rs = streamUris[key]; + if (rs && rs[1] == data.track.name) { + data.track.name = (rs[0] || rs[1]); + } + }; } songdata = data; - $("#modalname").html(data.name); + setSongTitle(data.track.name, false); - if (!data.length || data.length == 0) { + if (!data.track.length || data.track.length == 0) { songlength = 0; - $("#songlength").html(''); - pausePosTimer(); - $('#trackslider').slider('disable'); -// $('#streamnameinput').val(data.name); -// $('#streamuriinput').val(data.uri); + $("#songlength").html(''); + pausePosTimer(); + $('#trackslider').slider('disable'); + // $('#streamnameinput').val(data.track.name); + // $('#streamuriinput').val(data.track.uri); } else { - songlength = data.length; - $("#songlength").html(timeFromSeconds(data.length / 1000)); + songlength = data.track.length; + $("#songlength").html(timeFromSeconds(data.track.length / 1000)); $('#trackslider').slider('enable'); } var arttmp = ''; - if(data.artists) { - for (var j = 0; j < data.artists.length; j++) { - artistshtml += '' + data.artists[j].name + ''; - artiststext += data.artists[j].name; - if (j != data.artists.length - 1) { - artistshtml += ', '; - artiststext += ', '; + if(data.track.artists) { + for (var j = 0; j < data.track.artists.length; j++) { + artistshtml += '' + data.track.artists[j].name + ''; + artiststext += data.track.artists[j].name; + if (j != data.track.artists.length - 1) { + artistshtml += ', '; + artiststext += ', '; } } arttmp = artistshtml; } - if (data.album && data.album.name) { - $("#modalalbum").html('' + data.album.name + ''); - getCover(data.album, '#infocover, #controlspopupimage', 'extralarge'); + if (data.track.album && data.track.album.name) { + $("#modalalbum").html('' + data.track.album.name + ''); + getCover(data.track.album, '#infocover, #controlspopupimage', 'extralarge'); } else { - $("#modalalbum").html(''); - $("#infocover").attr('src', 'images/default_cover.png'); + $("#modalalbum").html(''); + $("#infocover").attr('src', 'images/default_cover.png'); $("#controlspopupimage").attr('src', 'images/default_cover.png'); } $("#modalartist").html(arttmp); $("#trackslider").attr("min", 0); - $("#trackslider").attr("max", data.length); + $("#trackslider").attr("max", data.track.length); resizeMb(); } -/*************** - * display popups - */ +/****************** + * display popups * + ******************/ function closePopups() { $('#popupTracks').popup('close'); $('#artistpopup').popup('close'); @@ -149,8 +161,7 @@ function closePopups() { $('#controlspopup').popup('close'); } - -function popupTracks(e, listuri, trackuri) { +function popupTracks(e, listuri, trackuri, tlid) { if (!e) var e = window.event; $('.popupTrackName').html(popupData[trackuri].name); @@ -192,10 +203,18 @@ function popupTracks(e, listuri, trackuri) { var popupName = '#popupTracks'; } - $(popupName).data("list", listuri).data("track", trackuri).popup("open", { - x : e.pageX, - y : e.pageY - }); + if (typeof tlid != 'undefined' && tlid != '') { + $(popupName).data("list", listuri).data("track", trackuri).data("tlid", tlid).popup("open", { + x : e.pageX, + y : e.pageY + }); + } else { + $(popupName).data("list", listuri).data("track", trackuri).popup("open", { + x : e.pageX, + y : e.pageY + }); + } + return false; } @@ -204,9 +223,9 @@ function showAlbumPopup(popupId) { showAlbum(popupData[uri].album.uri); } -/********************* - * initialize sockets - *********************/ +/********************** + * initialize sockets * + **********************/ function initSocketevents() { mopidy.on("state:online", function() { @@ -214,6 +233,9 @@ function initSocketevents() { getCurrentPlaylist(); updateStatusOfAll(); getPlaylists(); + getUriSchemes().then(function() { + showFavourites(); + }); getBrowseDir(); getSearchSchemes(); showLoading(false); @@ -230,12 +252,11 @@ function initSocketevents() { mopidy.on("event:trackPlaybackStarted", function(data) { mopidy.playback.getTimePosition().then(processCurrentposition, console.error); setPlayState(true); - setSongInfo(data.tl_track.track); + setSongInfo(data.tl_track); initPosTimer(); }); mopidy.on("event:trackPlaybackPaused", function(data) { - //setSongInfo(data.tl_track.track); pausePosTimer(); setPlayState(false); }); @@ -251,6 +272,10 @@ function initSocketevents() { } }); + mopidy.on("event:muteChanged", function(data) { + setMute(data["mute"]); + }); + mopidy.on("event:playbackStateChanged", function(data) { switch (data["new_state"]) { case "stopped": @@ -271,6 +296,10 @@ function initSocketevents() { mopidy.on("event:seeked", function(data) { setPosition(parseInt(data["time_position"])); }); + + mopidy.on("event:streamTitleChanged", function(data) { + setSongTitle(data["title"], true); + }); } $(document).bind("pageinit", function() { @@ -278,9 +307,9 @@ $(document).bind("pageinit", function() { }); -/************************ - * gui stuff - ************************/ +/************** + * gui stuff * + **************/ function enterFullscreen() { if (isMobileSafari) { alert ("To get this app in Full Screen, you have to add it to your home-screen using the Share button."); exit(); } var elem = document.querySelector("#page"); @@ -297,6 +326,7 @@ function enterFullscreen() { } } } + function exitFullscreen() { document.webkitExitFullscreen(); document.mozCancelFullscreen(); @@ -322,7 +352,6 @@ function switchContent(divid, uri) { if (uri) { hash += "?" + uri; } - // $.mobile.changePage("#" + hash); location.hash = "#" + hash; } @@ -337,8 +366,7 @@ function setHeadline(site){ //update timer function updateStatusTimer() { -// console.log('statustimer'); - mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); + mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error); //TODO check offline? } @@ -353,13 +381,14 @@ function updateOptions() { //update everything as if reloaded function updateStatusOfAll() { - mopidy.playback.getCurrentTrack().then(processCurrenttrack, console.error); + mopidy.playback.getCurrentTlTrack().then(processCurrenttrack, console.error); mopidy.playback.getTimePosition().then(processCurrentposition, console.error); mopidy.playback.getState().then(processPlaystate, console.error); updateOptions() mopidy.playback.getVolume().then(processVolume, console.error); + mopidy.mixer.getMute().then(processMute, console.error); } function locationHashChanged() { @@ -400,7 +429,7 @@ function locationHashChanged() { case 'search': $('#navsearch a').addClass($.mobile.activeBtnClass); $("#searchinput").focus(); - if (customTracklists['allresultscache'] == '') { + if (customTracklists['mbw:allresultscache'] == '') { initSearch($('#searchinput').val()); } break; @@ -419,7 +448,6 @@ function locationHashChanged() { break; } - //switch the footer switch(divid) { case 'nowPlaying': @@ -435,9 +463,9 @@ function locationHashChanged() { return false; } -/********************** - * initialize software - **********************/ +/*********************** + * initialize software * + ***********************/ $(document).ready(function(event) { //check for websockets if (!window.WebSocket) { @@ -453,14 +481,15 @@ $(document).ready(function(event) { $(window).hashchange(); // Connect to server -// mopidy = new Mopidy(); -// console.log(wsLocation); -// $.getScript( wsLocation + '/mopidy/mopidy.min.js'); - mopidy = new Mopidy({ - webSocketUrl: 'ws://' + wsLocation + '/mopidy/ws/' // wslocation is set in index.html "ws://localhost:6680/mopidy/ws/" - }); -// mopidy.on(console.log.bind(console)); // Log all events -// mopidy.on(console.error.bind(console)); + if (websocketUrl) { + mopidy = new Mopidy({ + webSocketUrl: websocketUrl, // wslocation is set in index.html from the extention config. + callingConvention: 'by-position-or-by-name' + }); + } else { + mopidy = new Mopidy({callingConvention: 'by-position-or-by-name'}); + } + //initialize events initSocketevents(); @@ -470,7 +499,6 @@ $(document).ready(function(event) { switchContent("home"); } - initgui = false; window.onhashchange = locationHashChanged; @@ -510,6 +538,13 @@ $(document).ready(function(event) { $('#homeshutdown').hide(); } + // remove Alarm Clock if it is not present + if (!hasAlarmClock) { + $('#navAlarmClock').hide(); + $('#homeAlarmClock').hide(); + $('#homeAlarmClock').nextAll().find('.ui-block-a, .ui-block-b').toggleClass('ui-block-a').toggleClass('ui-block-b'); + } + //navigation stuff $(document).keypress( function (event) { @@ -534,7 +569,7 @@ $(document).ready(function(event) { return true; } }); - initStreams(); + if ($(window).width() < 980) { $("#panel").panel("close"); @@ -549,7 +584,6 @@ $(document).ready(function(event) { $.event.special.swipe.horizontalDistanceThreshold = 125; // (default: 30px) Swipe horizontal displacement must be more than this. $.event.special.swipe.verticalDistanceThreshold = 50; // (default: 75px) Swipe vertical displacement must be less than this. -// $.event.special.swipe.scrollSupressionThreshold = 20; $.event.special.swipe.durationThreshold = 500; // swipe songinfo and panel @@ -567,10 +601,14 @@ $(document).ready(function(event) { } ); }); -function updatePlayIcons (uri) { +function updatePlayIcons (uri, tlid) { //update styles of listviews $('#currenttable li').each(function() { - if (this.id == 'currenttable-' + uri) { + var eachTlid = $(this).attr('tlid'); + if (typeof eachTlid != 'undefined') { + eachTlid = parseInt(eachTlid); + } + if (this.id == 'currenttable-' + uri && eachTlid == tlid) { $(this).addClass('currenttrack'); } else { $(this).removeClass("currenttrack"); @@ -584,6 +622,7 @@ function updatePlayIcons (uri) { $(this).removeClass("currenttrack2"); } }); + $('#trackresulttable li').each(function() { if (this.id == 'trackresulttable-' + uri) { $(this).addClass('currenttrack2'); diff --git a/mopidy_musicbox_webclient/static/js/images.js b/mopidy_musicbox_webclient/static/js/images.js index 2e28db7..5d89f24 100644 --- a/mopidy_musicbox_webclient/static/js/images.js +++ b/mopidy_musicbox_webclient/static/js/images.js @@ -2,14 +2,13 @@ * @author Wouter van Wijk */ -API_KEY= 'b6d34c3af91d62ab0ae00ab1b6fa8733'; +API_KEY = 'b6d34c3af91d62ab0ae00ab1b6fa8733'; API_SECRET = '2c631802c2285d5d5d1502462fe42a2b'; var fmcache; var lastfm; - -$(window).load(function() { +$(window).load(function () { // create a Cache object fmcache = new LastFMCache(); // create a LastFM object @@ -20,42 +19,40 @@ $(window).load(function() { }); }); - function getCover(album, images, size) { - var defUrl = 'images/default_cover.png'; - $(images).attr('src', defUrl); - if (!album) { - return; - } - var albumname = album.name || ''; - var artistname = ''; - if ( album.artists && (album.artists.length > 0) ) { - artistname = album.artists[0].name; - } -// console.log(album, images); - if (album.images && (album.images.length > 0) ) { - $(images).attr('src', album.images[0]); - } else { - lastfm.album.getInfo( {artist: artistname, album: albumname}, - { success: function(data){ - for (var i = 0; i < data.album.image.length; i++) { - if ( data.album.image[i]['size'] == size) { - $(images).attr('src', data.album.image[i]['#text'] || defUrl); - } + var defUrl = 'images/default_cover.png'; + $(images).attr('src', defUrl); + if (!album) { + return; + } + var albumname = album.name || ''; + var artistname = ''; + if ( album.artists && (album.artists.length > 0) ) { + artistname = album.artists[0].name; + } + if (album.images && (album.images.length > 0) ) { + $(images).attr('src', album.images[0]); + } else { + lastfm.album.getInfo( {artist: artistname, album: albumname}, + { success: function(data){ + for (var i = 0; i < data.album.image.length; i++) { + if ( data.album.image[i]['size'] == size) { + $(images).attr('src', data.album.image[i]['#text'] || defUrl); } } - }); + } + }); - } + } } function getArtistImage(nwartist, image, size) { - var defUrl = 'images/user_24x32.png'; - lastfm.artist.getInfo({artist: nwartist}, {success: function(data){ - for (var i = 0; i < data.artist.image.length; i++) { - if ( data.artist.image[i]['size'] == size) { - $(image).attr('src', data.artist.image[i]['#text'] || defUrl); - } + var defUrl = 'images/user_24x32.png'; + lastfm.artist.getInfo({artist: nwartist}, {success: function(data){ + for (var i = 0; i < data.artist.image.length; i++) { + if ( data.artist.image[i]['size'] == size) { + $(image).attr('src', data.artist.image[i]['#text'] || defUrl); } - }}); + } + }}); } \ No newline at end of file diff --git a/mopidy_musicbox_webclient/static/js/jquery.ba-hashchange.min.js b/mopidy_musicbox_webclient/static/js/jquery.ba-hashchange.min.js deleted file mode 100644 index 3c607ba..0000000 --- a/mopidy_musicbox_webclient/static/js/jquery.ba-hashchange.min.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * jQuery hashchange event - v1.3 - 7/21/2010 - * http://benalman.com/projects/jquery-hashchange-plugin/ - * - * Copyright (c) 2010 "Cowboy" Ben Alman - * Dual licensed under the MIT and GPL licenses. - * http://benalman.com/about/license/ - */ -(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('').hide().one("load",function(){r||l(a());n()}).attr("src",r||"javascript:0").insertAfter("body")[0].contentWindow;h.onpropertychange=function(){try{if(event.propertyName==="title"){q.document.title=h.title}}catch(s){}}}};j.stop=k;o=function(){return a(q.location.href)};l=function(v,s){var u=q.document,t=$.fn[c].domain;if(v!==s){u.title=h.title;u.open();t&&u.write(' - + diff --git a/mopidy_musicbox_webclient/web.py b/mopidy_musicbox_webclient/web.py index 815f34f..093f4f6 100644 --- a/mopidy_musicbox_webclient/web.py +++ b/mopidy_musicbox_webclient/web.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import logging -import string import tornado.web @@ -29,21 +28,33 @@ class IndexHandler(tornado.web.RequestHandler): def initialize(self, config, path): ext_config = config[MusicBoxExtension.ext_name] + host, port = ext_config['websocket_host'], ext_config['websocket_port'] + ws_url = '' + if host or port: + if not host: + host = self.request.host.partition(':')[0] + logger.warning('Musicbox websocket_host not specified, ' + 'using %s', host) + elif not port: + port = config['http']['port'] + logger.warning('Musicbox websocket_port not specified, ' + 'using %s', port) + protocol = 'ws' + if self.request.protocol == 'https': + protocol = 'wss' + ws_url = "%s://%s:%d/mopidy/ws" % (protocol, host, port) + self.__dict = { 'version': MusicBoxExtension.version, - 'musicbox': int(ext_config['musicbox']) + 'musicbox': ext_config.get('musicbox', False), + 'useWebsocketUrl': ws_url != '', + 'websocket_url': ws_url, + 'alarmclock': config.get('alarmclock', {}).get('enabled', False), } self.__path = path - self.__title = string.Template('MusicBox on $hostname') def get(self, path): - return self.render('index.html', title=self.get_title(), **self.__dict) - - def get_title(self): - hostname, sep, port = self.request.host.rpartition(':') - if not sep or not port.isdigit(): - hostname, port = self.request.host, '80' - return self.__title.safe_substitute(hostname=hostname, port=port) + return self.render('index.html', **self.__dict) def get_template_path(self): return self.__path diff --git a/screenshots/artist.png b/screenshots/artist.png deleted file mode 100644 index c061492..0000000 Binary files a/screenshots/artist.png and /dev/null differ diff --git a/screenshots/playlists-albums-cut.png b/screenshots/playlists-albums-cut.png deleted file mode 100644 index dcdd72c..0000000 Binary files a/screenshots/playlists-albums-cut.png and /dev/null differ diff --git a/screenshots/playlists-albums.png b/screenshots/playlists-albums.png deleted file mode 100644 index 9325fb0..0000000 Binary files a/screenshots/playlists-albums.png and /dev/null differ diff --git a/screenshots/playlists.png b/screenshots/playlists.png deleted file mode 100644 index d42cc91..0000000 Binary files a/screenshots/playlists.png and /dev/null differ diff --git a/screenshots/queue-small.png b/screenshots/queue-small.png deleted file mode 100644 index eee7516..0000000 Binary files a/screenshots/queue-small.png and /dev/null differ diff --git a/screenshots/queue.png b/screenshots/queue.png deleted file mode 100644 index 1d74c9c..0000000 Binary files a/screenshots/queue.png and /dev/null differ diff --git a/screenshots/search-small.png b/screenshots/search-small.png deleted file mode 100644 index 2a6dbe3..0000000 Binary files a/screenshots/search-small.png and /dev/null differ diff --git a/screenshots/search.png b/screenshots/search.png deleted file mode 100644 index cf5a5c3..0000000 Binary files a/screenshots/search.png and /dev/null differ diff --git a/setup.py b/setup.py index c594f79..17b680e 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup( include_package_data=True, install_requires=[ 'setuptools', - 'Mopidy >= 0.19', + 'Mopidy >= 1.1.0', ], entry_points={ 'mopidy.ext': [ diff --git a/tox.ini b/tox.ini index 5c00715..ead2ff1 100644 --- a/tox.ini +++ b/tox.ini @@ -2,14 +2,12 @@ envlist = py27, flake8 [testenv] -sitepackages = true deps = mock - mopidy==dev + mopidy pytest pytest-cov pytest-xdist -install_command = pip install --allow-unverified=mopidy --pre {opts} {packages} commands = py.test \ --basetemp={envtmpdir} \ @@ -21,4 +19,5 @@ commands = deps = flake8 flake8-import-order +skip_install = true commands = flake8