diff --git a/README.rst b/README.rst index a27e7f3..4f82b12 100644 --- a/README.rst +++ b/README.rst @@ -53,24 +53,23 @@ Project resources Changelog ========= -v1.0.2 Dev +v1.0.4 +------------------- + +- Added AudioAddict icon +- Bugfixes of course + +v1.0.2 ------------------- - A friendlier welcome with a home page with buttons to the most used functions - Converted Radio Stations to Streams, so user can add streams for youtube, spotify, soundcloud, podcasts -<<<<<<< HEAD - Enhanced radio/streams interface - Search: select service to search -- Youtube icons added -- Fixed single quote bug #39, other bugs -======= -- Improved radio/streams interface -- Better handling of coverart -- Search: select service to search -- Youtube icons added - Fixed single quote bug #39 +- Better handling of coverart +- Youtube icons added - Bugfixes (search, popups, etc) ->>>>>>> develop v1.0.1 (20-9-2014) ------------------- diff --git a/mopidy_musicbox_webclient/static/css/webclient.css b/mopidy_musicbox_webclient/static/css/webclient.css index 0bcd8fa..507f791 100644 --- a/mopidy_musicbox_webclient/static/css/webclient.css +++ b/mopidy_musicbox_webclient/static/css/webclient.css @@ -223,19 +223,6 @@ color: white; } -<<<<<<< HEAD -/*** home ***/ - -#homerows div { - text-align:center; - background-color: #2C3E50; - padding: 2px; - padding-top: 20px; - border: 3px solid white; -} - -======= ->>>>>>> develop #homerows div i { font-size: 28px; } diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index 6562777..8d7843a 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -79,13 +79,10 @@ -<<<<<<< HEAD - -<<<<<<< HEAD - -======= ->>>>>>> develop
  • @@ -222,74 +206,23 @@
    -<<<<<<< HEAD -
    - -
    - -
    Now Playing
    -=======

    Now Playing

    ->>>>>>> develop
    -<<<<<<< HEAD -
    Queue
    -
    -     - -
    - -
    Playlists
    -
    -     - -
    - -
    Browse
    -
    -     - -
    - -
    Search
    -
    -     - -
    - -
    Streams
    -
    -     - -
    - -
    Settings
    -
    -     - -
    - -
    System
    -=======

    Queue

     @@ -327,7 +260,6 @@

    System

    ->>>>>>> develop
    @@ -542,4 +474,4 @@ - + \ No newline at end of file diff --git a/mopidy_musicbox_webclient/static/js/functionsvars bk.js b/mopidy_musicbox_webclient/static/js/functionsvars bk.js deleted file mode 100644 index 9932541..0000000 --- a/mopidy_musicbox_webclient/static/js/functionsvars bk.js +++ /dev/null @@ -1,502 +0,0 @@ -/** - * @author Wouter van Wijk - * - * 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 -var play = false; -var random; -var repeat; -var currentVolume = -1; -var muteVolume = -1; -var volumeChanging = false; -var posChanging = false; - -var posTimer; -var volumeTimer; -var seekTimer; -var initgui = true; -var currentpos = 0; -var popupData = {}; -var songlength = 0; - -var artistshtml = ''; -var artiststext = ''; -var songname = ''; -var songdata = ''; -var newposition = 0; - -var playlisttracksScroll; -var playlistslistScroll; - -//array of cached playlists (not only user-playlists, also search, artist, album-playlists) -var playlists = {}; -var currentplaylist; -var customPlaylists = []; -var customTracklists = []; - -var browseStack = []; - -var ua = navigator.userAgent, - isMobileSafari = /Mac/.test(ua) && /Mobile/.test(ua), isMobileWebkit = /WebKit/.test(ua) && /Mobile/.test(ua), isMobile = /Mobile/.test(ua), isWebkit = /WebKit/.test(ua); - -//constants -PROGRAM_NAME = 'MusicBox'; -//PROGRAM_NAME = 'Mopidy'; -ARTIST_TABLE = '#artiststable'; -ALBUM_TABLE = '#albumstable'; -PLAYLIST_TABLE = '#playlisttracks'; -CURRENT_PLAYLIST_TABLE = '#currenttable'; -SEARCH_ALL_TABLE = '#allresulttable'; -SEARCH_ALBUM_TABLE = '#albumresulttable'; -SEARCH_ARTIST_TABLE = '#artistresulttable'; -SEARCH_TRACK_TABLE = '#trackresulttable'; - -PLAY_NOW = 0; -PLAY_NEXT = 1; -ADD_THIS_BOTTOM = 2; -ADD_ALL_BOTTOM = 3; - -MAX_TABLEROWS = 50; - -//update track slider timer, milliseconds -TRACK_TIMER = 1000; - -//check status timer, every 5 or 10 sec -STATUS_TIMER = 10000; - -// the first part of Mopidy extensions which serve radio streams -var radioExtensionsList = ['somafm', 'tunein', 'dirble']; - -var uriClassList = [ ['spotify', 'fa-spotify'], ['local', 'fa-file-sound-o'], ['podcast', 'fa-rss-square'], ['dirble', 'fa-microphone'], - ['tunein', 'fa-headphones'], ['soundcloud', 'fa-soundcloud'], ['sc', 'fa-soundcloud'], ['gmusic', 'fa-google'], ['internetarchive', 'fa-university'], ['somafm', 'fa-flask'], ['youtube', 'fa-youtube'], ['yt', 'fa-youtube'], ['subsonic', 'fa-folder-open'] ]; - -var uriHumanList = [ ['spotify', 'Spotify'], ['local', 'Local Files'], ['podcast', 'Podcasts'], ['dirble', 'Dirble'], - ['tunein', 'TuneIn'], ['soundcloud', 'SoundCloud'], ['gmusic', 'Google Music'], ['internetarchive', 'Internet Archive'], ['somafm', 'Soma FM'], ['youtube', 'YouTube'], ['subsonic', 'Subsonic'] ]; - -var uriServiceDetectList = [['youtube.com', 'yt'], ['soundcloud.com', 'sc']]; - -function scrollToTop() { - var divtop = 0; - $('body,html').animate({ - scrollTop : divtop - }, 250); -} - -function scrollToTracklist() { -/* if (isMobileWebkit) { - playlistslistScroll.refresh(); - } -*/ - var divtop = $("#playlisttracksdiv").offset().top - 50; - $('body,html').animate({ - scrollTop : divtop - }, 250); -} - -//A hack to find the name of the first artist of a playlist. this is not yet returned by mopidy -//does not work wel with multiple artists of course -function getArtist(pl) { - for (var i = 0; i < pl.length; i++) { - for (var j = 0; j < pl[i].artists.length; j++) { - if (pl[i].artists[j].name != '') { - return pl[i].artists[j].name; - } - } - }; -} - -//A hack to find the first album of a playlist. this is not yet returned by mopidy -function getAlbum(pl) { - for (var i = 0; i < pl.length; i++) { - if (pl[i].album.name != '') { - return pl[i].album.name; - } - }; -} - -/******************************************************** - * break up results and put them in album tables - *********************************************************/ -function albumTracksToTable(pl, target, uri) { - var tmp = '
      '; - var liId = ''; - var targetmin = target.substr(1); - $(target).empty(); - 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 += '
    '; - $(target).html(tmp); - $(target).attr('data', uri); -} - -function renderSongLi(song, liID, uri, playlistType){ - var name; - if (!song.name || song.name == '') { - name = uri.split('/'); - name = decodeURI(name[name.length - 1]); - } else { - name = song.name; - } -// var iconClass = getMediaClass(liID.split('-')[1]); - songLi = '
  • ' + - '' + - '' + - '' +'' + -// '

    ' + name + '

    ' + - '

    ' + name + '

    ' + - '    ' + - - '
    • '; - return songLi; -} - -function resultsToTables(results, target, uri) { - if (!results) { return } - if (target == '#currenttable') { - playlistType = 'playTrackQueueByUri'; - } else { - playlistType = 'playTrackByUri'; - } - - var newalbum = []; - //keep a list of albums for retreiving of covers - var coversList = []; - var nextname = ''; - var count = 0; - $(target).html(''); - - //break into albums and put in tables - var html = ''; - var tableid, j, artistname, alburi, name, iconClass; - var targetmin = target.substr(1); - $(target).attr('data', uri); - var length = 0 || results.length; - for ( i = 0; i < length; i++) { - //create album if none extists - if (!results[i].album) { results[i].album={}; } - //create album uri if there is none - if (!results[i].album.uri) { results[i].album.uri = 'x'; } - if (!results[i].album.name) { results[i].album.name = ''; } - //create name if there is no one - if (!results[i].name || results[i].name == '') { - name = results[i].uri.split('/'); - results[i].name = decodeURI(name[name.length - 1]) || 'Track ' + String(i); - } - - //leave out unplayable items - if (results[i].name.substring(0,12) == '[unplayable]') continue; - - newalbum.push(results[i]); - nextname = ''; - if ((i < length - 1) && results[i+1].album && results[i+1].album.name ) { - nextname = results[i + 1].album.name; - } - if (results[i].length == -1) { - html += '

  • ' + results[i].name + ' [Stream]

    • '; - newalbum = []; - nextname = ''; - } else { - if ( (results[i].album.name != nextname) || (nextname == '') ) { - tableid = 'art' + i; - //render differently if only one track in the album - if ( newalbum.length == 1 ) { - if (i != 0) { html += '
  •  
    • '; } - iconClass = getMediaClass(newalbum[0].uri); - html += '
  • ' + - '' + - '' + - '' + - '

    ' + newalbum[0].name + "

    "; -/* '' + timeFromSeconds(newalbum[0].length / 1000) + ''; */ - if (newalbum[0].artists) { - for ( j = 0; j < newalbum[0].artists.length; j++) { - html += newalbum[0].artists[j].name; - html += (j == newalbum[0].artists.length - 1) ? '' : ' / '; - //stop after 3 - if (j > 2) { - html += '...'; - break; - } - } - } - if ( newalbum[0].album.name != '') { html += ' / ';} - html += '' + newalbum[0].album.name + '

    '; - html += '
    • '; - - popupData[newalbum[0].uri] = newalbum[0]; - newalbum = []; - } else { //newalbum length - if ( results[i].album.uri && results[i].album.name ) { -// iconClass = getMediaClass(results[i].album.uri); - iconClass = getMediaClass(newalbum[0].uri); - html += '
  • '; - html += '

    ' + results[i].album.name + '

    '; - } - if (results[i].album.artists) { - for (j = 0; j < results[i].album.artists.length; j++) { - html += results[i].album.artists[j].name; - html += (j == results[i].album.artists.length - 1) ? '' : ' / '; - //stop after 3 - if (j > 2) { - child += '...'; - break; - } - } - } - html += '

    • '; - for (j = 0; j < newalbum.length; j++) { - popupData[newalbum[j].uri] = newalbum[j]; -// html += '
  • '; - - //hERE! - var liID = targetmin + '-' + newalbum[j].uri; - html+= renderSongLi(newalbum[j], liID, uri, playlistType); - - //html += '
  • '; - //html += '

    ' + timeFromSeconds(newalbum[j].length / 1000) + '

    ' + newalbum[j].name + '

    • '; - } - newalbum = []; - if (results[i].album) { - coversList.push([results[i].album, i]); - } - } //newalbum length - if (results[i].album) { - coversList.push([results[i].album, i]); - } - } //albums name - } - } - tableid = "#" + tableid; - $(target).html(html); - $(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'); - } -} - -//process updated playlist to gui -function playlisttotable(pl, target, uri) { - var tmp = ''; - $(target).html(''); - var targetmin = target.substr(1); - var child = ''; - for (var i = 0; i < pl.length; i++) { - if (pl[i]) { - popupData[pl[i].uri] = pl[i]; - child = '
  • '; - child += '

    ' + 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; - child += (j == pl[i].artists.length - 1) ? '' : ' / '; - //stop after 3 - if (j > 2) { - child += '...'; - break; - } - } - } - child += ' / ' + pl[i].album.name + '

    '; - child += '
    • '; - tmp += child; - } - }; - - $(target).html(tmp); - $(target).attr('data', uri); -} - -function getPlaylistFromUri(uri) { - if (playlists[uri]) { - return playlists[uri]; - } - if (customPlaylists[uri]) { - return customPlaylists[uri]; - } -} - -function getTracksFromUri(uri) { - var pl = getPlaylistFromUri(uri); - if (pl) { - return pl.tracks; - } else if (customTracklists[uri]) { - return customTracklists[uri]; - } - return []; -} - -//convert time to human readable format -function timeFromSeconds(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); - 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; - message = message || "Loading..."; - delay = delay || 1000; - $.mobile.loading( 'show', { - text: message, - textVisible: true, - theme: 'a', - textonly: textOnl - }); - if(delay > 0) { - setTimeout(function(){ - $.mobile.loading('hide'); - }, delay); - } -} - -/***************** - * Modal dialogs - *****************/ -function showLoading(on) { - if (on) { - $("body").css("cursor", "progress"); - $.mobile.loading('show', { - text : 'Loading data from ' + PROGRAM_NAME + '. Please wait...', - textVisible : true, - theme : 'a' - }); - } else { - $("body").css("cursor", "default"); - $.mobile.loading('hide'); - } -} - -function showOffline(on) { - if (on) { - $.mobile.loading('show', { - text : 'Trying to reach ' + PROGRAM_NAME + '. Please wait...', - textVisible : true, - theme : 'a' - }); - } else { - $.mobile.loading('hide'); - } -} - - -// 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); -} - -function validServiceUri(str) { - return validUri(str) || isServiceUri(str); -} - -/* -$.event.special.swipe = $.extend($.event.special.swipe, { - start: function( event ) { - var data = event.originalEvent.touches ? - event.originalEvent.touches[ 0 ] : event; - return { - time: ( new Date() ).getTime(), - coords: [ data.pageX, data.pageY ], - origin: $( event.target ), - offset: $('body').scrollTop() - }; - }, - - stop: function( event ) { - var data = event.originalEvent.touches ? - event.originalEvent.touches[ 0 ] : event; - return { - time: ( new Date() ).getTime(), - coords: [ data.pageX, data.pageY ], - offset: $('body').scrollTop() - }; - alert.log('stop'); - }, - - handleSwipe: function( start, stop ) { - var swipe = $.event.special.swipe, - x = Math.abs( start.coords[ 0 ] - stop.coords[ 0 ] ), - y = Math.abs( start.coords[ 1 ] - stop.coords[ 1 ] ), - offset = Math.abs( start.offset - stop.offset ), - time = stop.time - start.time; - if ( time < swipe.durationThreshold && x > swipe.horizontalDistanceThreshold && ( y + offset ) - < swipe.verticalDistanceThreshold ) { - - start.origin.trigger( "swipe" ).trigger( ( start.coords[ 0 ] - stop.coords[ 0 ] ) ? "swipeleft" : "swiperight" ); - -// alert(x + ' ' + y + ' ' + time + ' ' + offset + ' ' + swipe.verticalDistanceThreshold); - } - } -}); -*/ - -function isStreamUri (uri) { - var uriSplit = uri.split(":"); - var a = validUri(uri); - var b = radioExtensionsList.indexOf(uriSplit[0].toLowerCase()) >= 0; - return a || b; -} - -function getMediaClass(uri) { - var uriSplit = uri.split(":")[0].toLowerCase(); - for (var i = 0; i < uriClassList.length; i++) { - if (uriSplit == uriClassList[i][0]) { - return "fa " + uriClassList[i][1]; - } - } - return ''; -} - -function getMediaHuman(uri) { - var uriSplit = uri.split(":")[0].toLowerCase(); - for (var i = 0; i < uriHumanList.length; i++) { - if (uriSplit == uriHumanList[i][0]) { - return uriHumanList[i][1]; - } - } - return ''; -} - -function isServiceUri(uri) { - var uriSplit = uri.split(":")[0].toLowerCase(); - var retVal = false; - - for (var i = 0; i < uriClassList.length; i++) { - if (uriSplit == uriClassList[i][0]) { - retVal = true; - } - } - - for (var i = 0; i < radioExtensionsList.length; i++) { - if (uriSplit == radioExtensionsList[i]) { - retVal = true; - } - } - - return retVal; -} -