diff --git a/.gitignore b/.gitignore index 2d6dcae..e3a264c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,9 @@ dist/ docs/_build/ mopidy.log* node_modules/ -nosetests.xml \ No newline at end of file +nosetests.xml +.project + +*.pbxproj + +Mopidy Webclient/Mopidy Webclient.xcodeproj/project.pbxproj diff --git a/MopidyWebclientFor0.11.zip b/MopidyWebclientFor0.11.zip new file mode 100644 index 0000000..82ae200 Binary files /dev/null and b/MopidyWebclientFor0.11.zip differ diff --git a/README.rst b/README.rst index a5b0fad..b64de1e 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,9 @@ This is a responsive html/js/css client for Mopidy. Responsive, so it works on d Development =========== -Note: this client under heavy development! At the moment, initial loading is extremely slow, especially on mobile devices. As Mopidy changes, this client changes as well. It tries to follow the development-branch of Mopidy for now, so update Mopidy as you update the client. +Note: this Git-version is under heavy development! As Mopidy changes, this client changes as well. It tries to follow the development-branch of Mopidy for now, so update Mopidy as you update the client. +If you use older versions of Mopidy, you can try a Zip-file with the correct version. + Installation ============ @@ -19,7 +21,8 @@ To install Mopidy, check out `the installation docs
+

- Getting data from the server. Please wait... -
-
- This could take a while (Too much of a while actually. Will be fixed...) + Getting data from Spotify. This could take a while if you just started Mopidy. Please wait...

diff --git a/js/bootstrap-alert.js b/webclient/js/bootstrap-alert.js similarity index 100% rename from js/bootstrap-alert.js rename to webclient/js/bootstrap-alert.js diff --git a/js/bootstrap-button.js b/webclient/js/bootstrap-button.js similarity index 100% rename from js/bootstrap-button.js rename to webclient/js/bootstrap-button.js diff --git a/js/bootstrap-carousel.js b/webclient/js/bootstrap-carousel.js similarity index 100% rename from js/bootstrap-carousel.js rename to webclient/js/bootstrap-carousel.js diff --git a/js/bootstrap-collapse.js b/webclient/js/bootstrap-collapse.js similarity index 100% rename from js/bootstrap-collapse.js rename to webclient/js/bootstrap-collapse.js diff --git a/js/bootstrap-dropdown.js b/webclient/js/bootstrap-dropdown.js similarity index 100% rename from js/bootstrap-dropdown.js rename to webclient/js/bootstrap-dropdown.js diff --git a/js/bootstrap-modal.js b/webclient/js/bootstrap-modal.js similarity index 100% rename from js/bootstrap-modal.js rename to webclient/js/bootstrap-modal.js diff --git a/js/bootstrap-popover.js b/webclient/js/bootstrap-popover.js similarity index 100% rename from js/bootstrap-popover.js rename to webclient/js/bootstrap-popover.js diff --git a/js/bootstrap-scrollspy.js b/webclient/js/bootstrap-scrollspy.js similarity index 100% rename from js/bootstrap-scrollspy.js rename to webclient/js/bootstrap-scrollspy.js diff --git a/js/bootstrap-tab.js b/webclient/js/bootstrap-tab.js similarity index 100% rename from js/bootstrap-tab.js rename to webclient/js/bootstrap-tab.js diff --git a/js/bootstrap-tooltip.js b/webclient/js/bootstrap-tooltip.js similarity index 100% rename from js/bootstrap-tooltip.js rename to webclient/js/bootstrap-tooltip.js diff --git a/js/bootstrap-transition.js b/webclient/js/bootstrap-transition.js similarity index 100% rename from js/bootstrap-transition.js rename to webclient/js/bootstrap-transition.js diff --git a/js/bootstrap-typeahead.js b/webclient/js/bootstrap-typeahead.js similarity index 100% rename from js/bootstrap-typeahead.js rename to webclient/js/bootstrap-typeahead.js diff --git a/js/bootstrap.js b/webclient/js/bootstrap.js similarity index 100% rename from js/bootstrap.js rename to webclient/js/bootstrap.js diff --git a/js/bootstrap.min.js b/webclient/js/bootstrap.min.js similarity index 100% rename from js/bootstrap.min.js rename to webclient/js/bootstrap.min.js diff --git a/js/functionsvars.js b/webclient/js/functionsvars.js similarity index 92% rename from js/functionsvars.js rename to webclient/js/functionsvars.js index 0477885..98f0651 100755 --- a/js/functionsvars.js +++ b/webclient/js/functionsvars.js @@ -28,7 +28,7 @@ var artiststext = ''; var songname = ''; //array of cached playlists (not only user-playlists, also search, artist, album-playlists) -var playlists = ''; +var playlists = new Object; var currentplaylist; var customPlaylists = new Array(); var customTracklists = new Array(); @@ -74,7 +74,7 @@ function playlisttotable(pl, table, uri) { Length */ - tmp = ''; + var tmp = ''; $(table).empty(); // console.log(pl.length); @@ -104,19 +104,24 @@ function playlisttotable(pl, table, uri) { } function getPlaylistFromUri(uri) { - for (var i = 0; i < playlists.length; i++) { +/* for (var i = 0; i < playlists.length; i++) { if (playlists[i]["uri"] == uri) { return playlists[i]; } } - - if (customPlaylists[uri]) { +*/ + if (playlists[uri]) { + return playlists[uri]; + } + + if(customPlaylists[uri]) { return customPlaylists[uri]; } } function getTracksFromUri(uri) { - pl = getPlaylistFromUri(uri); + var pl = getPlaylistFromUri(uri); + console.log(pl); if (pl) { return pl.tracks; } else if (customTracklists[uri]) { @@ -126,7 +131,7 @@ function getTracksFromUri(uri) { //convert time to human readable format function timeFromSeconds(length) { - d = Number(length); + var d = Number(length); var h = Math.floor(d / 3600); var m = Math.floor(d % 3600 / 60); var s = Math.floor(d % 3600 % 60); diff --git a/js/gui.js b/webclient/js/gui.js similarity index 88% rename from js/gui.js rename to webclient/js/gui.js index da9dbc4..fa5fafe 100755 --- a/js/gui.js +++ b/webclient/js/gui.js @@ -8,7 +8,7 @@ var mopidy; function showartist(nwuri) { $(ARTIST_TABLE).empty(); //fill from cache - pl = getTracksFromUri(nwuri); + var pl = getTracksFromUri(nwuri); console.log(pl); if (pl) { playlisttotable(pl, ARTIST_TABLE, nwuri) @@ -27,7 +27,7 @@ function showartist(nwuri) { function showalbum(uri) { $(ALBUM_TABLE).empty(); //fill from cache - pl = getTracksFromUri(uri); + var pl = getTracksFromUri(uri); console.log(pl); if (pl) { playlisttotable(pl, ALBUM_TABLE, uri) @@ -49,7 +49,7 @@ function resetSong() { pauseTimer(); setPlayState(false); setPosition(0); - data = new Object; + var data = new Object; data["name"] = ''; data["artists"] = ''; data["length"] = 0; @@ -136,23 +136,9 @@ function doPlayPause() { setPlayState(!play); } -/* Show tracks of playlist */ -function setPlaylist(uri) { - $(PLAYLIST_TABLE).empty(); - $('#playlisttablediv').show(); - // $('#playlistloader').show(); - - pl = getPlaylistFromUri(uri); - - //console.log(pl); - playlisttotable(pl["tracks"], PLAYLIST_TABLE, uri); - $('body,html').scrollTop($("#playlistspane").offset().top - 100); - return false; -} - /* Initialise search */ function searchPressed(key) { - value = $('#searchinput').val(); + var value = $('#searchinput').val(); // console.log(value); // console.log(key); switchContent('search'); @@ -192,10 +178,10 @@ function doMute() { if (muteVolume == -1) { $("#mutebt").attr('src', 'img/icons/volume_mute_24x18.png'); muteVolume = currentVolume; - mopidy.playback.setVolume(0).then(console.log, console.log); + mopidy.playback.setVolume(0); } else { $("#mutebt").attr('src', 'img/icons/volume_24x18.png'); - mopidy.playback.setVolume(muteVolume).then(console.log, console.log); + mopidy.playback.setVolume(muteVolume); muteVolume = -1; } @@ -264,7 +250,7 @@ function doVolume(value) { } function doSeekPos(value) { - val = Math.round(value); + var val = Math.round(value); if (!initgui) { //set timer to not trigger it too much clearTimeout(seekTimer); @@ -283,7 +269,29 @@ function triggerPos() { } function getPlaylists() { - mopidy.playlists.getPlaylists().then(processGetplaylists, console.error); +/******************************************************** + * get playlists without tracks + ********************************************************/ + mopidy.playlists.getPlaylists(false).then(processGetPlaylists, console.error); +} + +function showTracklist(uri) { +/******************************************************** + * Show tracks of playlist + ********************************************************/ + $(PLAYLIST_TABLE).empty(); + $('#playlisttablediv').show(); + $('#playlistloader').show(); + + var pl = getPlaylistFromUri(uri); + console.log (pl); + //load from cache + if (pl) { + playlisttotable(pl.tracks, PLAYLIST_TABLE, uri); + $('body,html').scrollTop($("#playlistspane").offset().top - 100); + } + mopidy.playlists.lookup(uri).then(processGetTracklist, console.error); + return false; } function getCurrentPlaylist() { @@ -291,7 +299,7 @@ function getCurrentPlaylist() { } function setPosition(pos) { - oldval = initgui; + var oldval = initgui; currentposition = pos; initgui = true; $("#trackslider").attr("value", currentposition); @@ -370,7 +378,7 @@ function setVolume(value) { } function switchContent(divid, uri) { - hash = divid; + var hash = divid; if (uri) { hash += "/" + uri; } @@ -402,10 +410,11 @@ function pauseTimer() { $(document).ready(function() { - mopidy = new Mopidy(); // Connect to server - mopidy.on(console.log); + mopidy = new Mopidy(); // Log all events + mopidy.on(function () { console.log(arguments); }); + //initialize events initSocketevents(); $('.content').hide(); @@ -427,8 +436,8 @@ $(document).ready(function() { var hash = location.hash.split("/"); //remove # - divid = hash[0].substr(1); - uri = hash[1]; + var divid = hash[0].substr(1); + var uri = hash[1]; switch(divid) { case 'current': @@ -454,7 +463,7 @@ $(document).ready(function() { } // Set the page title based on the hash. - document.title = PROGRAM_NAME + ' - ' + divid; + //document.title = PROGRAM_NAME + ' - ' + divid; $('.content').hide(); $('.nav li').removeClass('active'); @@ -470,6 +479,18 @@ $(document).ready(function() { if (location.hash.length < 2) { switchContent("playlists"); } + + // disable closing of modal boxes + $('#offlinemodal').modal({ + backdrop: 'static', + keyboard: false + }) + $('#loadingmodal').modal({ + backdrop: 'static', + keyboard: false + }) + + // $("#songinfo").resize(resizeSonginfo()); initgui = false; //update gui every x seconds from mopdidy diff --git a/js/html5slider.js b/webclient/js/html5slider.js similarity index 100% rename from js/html5slider.js rename to webclient/js/html5slider.js diff --git a/js/jquery.ba-hashchange.min.js b/webclient/js/jquery.ba-hashchange.min.js similarity index 100% rename from js/jquery.ba-hashchange.min.js rename to webclient/js/jquery.ba-hashchange.min.js diff --git a/js/jquery.js b/webclient/js/jquery.js similarity index 100% rename from js/jquery.js rename to webclient/js/jquery.js diff --git a/js/jquery.truncate.min.js b/webclient/js/jquery.truncate.min.js similarity index 100% rename from js/jquery.truncate.min.js rename to webclient/js/jquery.truncate.min.js diff --git a/js/ws.js b/webclient/js/ws.js similarity index 87% rename from js/ws.js rename to webclient/js/ws.js index 425d155..3b7111b 100755 --- a/js/ws.js +++ b/webclient/js/ws.js @@ -9,10 +9,10 @@ * play an uri from a trackslist or the current playlist *********************************************************/ function playtrack(uri, playlisturi) { - trackslist = new Array(); + var trackslist = new Array(); var track; switchContent('current', uri); - tracks = getTracksFromUri(playlisturi); + var tracks = getTracksFromUri(playlisturi); console.log(tracks); if (tracks) { $(CURRENT_PLAYLIST_TABLE).empty(); @@ -63,7 +63,7 @@ function processRandom(data) { * process results of current position *********************************************************/ function processCurrentposition(data) { - pos = parseInt(data); + var pos = parseInt(data); setPosition(pos); console.log('pos:' + pos); } @@ -84,17 +84,17 @@ function processPlaystate(data) { /******************************************************** * process results of list of playlists of the user *********************************************************/ -function processGetplaylists(resultArr) { +function processGetPlaylists(resultArr) { /*

  • Donec id elit non mi porta
  • Gravida at eget metus. Fusce dapibus.
  • Tellus ac cursus commodo

    • More »

    */ + if ((!resultArr) || (resultArr == '')) { return; } - playlists = resultArr; - tmp = ''; - for (var i = 0; i < playlists.length; i++) { - var child = '
  • ' + playlists[i]["name"] + '
    • '; + var tmp = ''; + for (var i = 0; i < resultArr.length; i++) { + var child = '
  • ' + resultArr[i]["name"] + '
    • '; tmp += child; }; $('#playlistslist').empty(); @@ -106,11 +106,14 @@ function processGetplaylists(resultArr) { /******************************************************** * process results of a returned playlist *********************************************************/ -function processSinglePlaylist(resultArr) { - //cache - newplaylisturi = resultArr["uri"]; +function processGetTracklist(resultArr) { + //cache result + var newplaylisturi = resultArr["uri"]; playlists[newplaylisturi] = resultArr; - playlisttotable(playlists[newplaylisturi], PLAYLIST_TABLE, newplaylisturi); + console.log(playlists[newplaylisturi]); + playlisttotable(playlists[newplaylisturi].tracks, PLAYLIST_TABLE, newplaylisturi); + + $('body,html').scrollTop($("#playlistspane").offset().top - 100); $('#playlistloader').hide(); } @@ -127,12 +130,13 @@ function processCurrentPlaylist(resultArr) { * process results of a search *********************************************************/ function processSearchResults(resultArr) { + console.log(resultArr); $(SEARCH_TRACK_TABLE).empty(); $(SEARCH_ARTIST_TABLE).empty(); $(SEARCH_ALBUM_TABLE).empty(); $("#searchresults").show(); //get the right result - results = resultArr[0]; + var results = resultArr[0]; playlisttotable(results.tracks, SEARCH_TRACK_TABLE, 'trackresultscache'); @@ -174,6 +178,7 @@ function processSearchResults(resultArr) { * process results of an artist lookup *********************************************************/ function processArtistResults(resultArr) { + console.log(resultArr.uri); customTracklists[resultArr["uri"]] = resultArr; playlisttotable(resultArr, ARTIST_TABLE, resultArr["uri"]); $('#h_artistname').html(getArtist(resultArr)); @@ -184,6 +189,7 @@ function processArtistResults(resultArr) { * process results of an album lookup *********************************************************/ function processAlbumResults(resultArr) { + console.log(resultArr.uri); customTracklists[resultArr["uri"]] = resultArr; playlisttotable(resultArr, ALBUM_TABLE, resultArr["uri"]); $('#h_albumname').html(getAlbum(resultArr));