From 2d95978829ff396892bcdd76129e615a0fe458d2 Mon Sep 17 00:00:00 2001 From: Szymon Nowak Date: Tue, 15 Jul 2014 11:34:12 +0200 Subject: [PATCH 1/8] Allow to search for Spotify playlists by Spotify URI. Search query should look like e.g.: "spotify:user:spotify:playlist:2Qi8yAzfj1KavAhWz1gaem" --- webclient/js/library.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/webclient/js/library.js b/webclient/js/library.js index 1abf0e1..ec45d1b 100644 --- a/webclient/js/library.js +++ b/webclient/js/library.js @@ -18,7 +18,7 @@ function initSearch() { if ((value.length < 100) && (value.length > 0)) { showLoading(true); - //hide ios/android keyboard + //hide ios/android keyboard document.activeElement.blur(); $("input").blur(); @@ -27,10 +27,19 @@ function initSearch() { delete customTracklists['albumresultscache']; delete customTracklists['trackresultscache']; $("#searchresults").hide(); - mopidy.library.search({ - any: [value] - }).then(processSearchResults, console.error); -// console.log('search sent', value); + + var query = {}, + uris = []; + + if (value.match(/^spotify:/)) { + query = {uri: [value]}; + uris = ["spotify:"]; + } else { + query = {any: [value]}; + } + + mopidy.library.search(query, uris).then(processSearchResults, console.error); + // console.log('search sent', value); } } From 736ebcee8094de27aded6b7b79a4095ba9b5556e Mon Sep 17 00:00:00 2001 From: Szymon Nowak Date: Tue, 15 Jul 2014 14:28:38 +0200 Subject: [PATCH 2/8] Allow to search by any supported URI scheme --- webclient/js/library.js | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/webclient/js/library.js b/webclient/js/library.js index ec45d1b..ed39ba6 100644 --- a/webclient/js/library.js +++ b/webclient/js/library.js @@ -28,18 +28,26 @@ function initSearch() { delete customTracklists['trackresultscache']; $("#searchresults").hide(); - var query = {}, - uris = []; + mopidy.getUriSchemes().then(function (schemes) { + var query = {}, + uris = []; - if (value.match(/^spotify:/)) { - query = {uri: [value]}; - uris = ["spotify:"]; - } else { - query = {any: [value]}; - } + var regexp = $.map(schemes, function (scheme) { + return '^' + scheme + ':'; + }).join('|'); - mopidy.library.search(query, uris).then(processSearchResults, console.error); - // console.log('search sent', value); + var match = value.match(regexp); + if (match) { + var scheme = match[0]; + query = {uri: [value]}; + uris = [scheme]; + } else { + query = {any: [value]}; + } + + mopidy.library.search(query, uris).then(processSearchResults, console.error); + // console.log('search sent', value); + }); } } From e8c618377a252600e8b44ef2ad200ab764f70bae Mon Sep 17 00:00:00 2001 From: itchytag Date: Mon, 21 Jul 2014 14:34:39 -0400 Subject: [PATCH 3/8] Update control.js Remove icons from shuffle/repeat buttons and use color to indicate if the functions are active. --- webclient/js/controls.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webclient/js/controls.js b/webclient/js/controls.js index db507aa..3502144 100644 --- a/webclient/js/controls.js +++ b/webclient/js/controls.js @@ -312,9 +312,9 @@ function setRepeat(nwrepeat) { return } if (!nwrepeat) { - $("#repeatbt").attr('src', 'images/icons/reload_alt_18x21.png'); + $("#repeatbt").attr('style', 'color:#7cc4e7'); } else { - $("#repeatbt").attr('src', 'images/icons/reload_18x21.png'); + $("#repeatbt").attr('style', 'color:#66FF33'); } repeat = nwrepeat; } @@ -324,9 +324,9 @@ function setRandom(nwrandom) { return } if (!nwrandom) { - $("#randombt").attr('src', 'images/icons/loop_alt2_24x21.png'); + $("#randombt").attr('style', 'color:#7cc4e7'); } else { - $("#randombt").attr('src', 'images/icons/loop_24x24.png'); + $("#randombt").attr('style', 'color:#66FF33'); } random = nwrandom; } From 190c1b476a470cd21175c6ab077c66b1acafa67a Mon Sep 17 00:00:00 2001 From: woutervanwijk Date: Sat, 20 Sep 2014 00:18:16 +0200 Subject: [PATCH 4/8] small fixes for pypi --- MANIFEST.in | 1 - Mopidy_MusicBox_Webclient.egg-info/PKG-INFO | 96 ++++++++++++++++ .../SOURCES.txt | 108 ++++++++++++++++++ .../dependency_links.txt | 1 + .../entry_points.txt | 3 + .../not-zip-safe | 1 + .../requires.txt | 2 + .../top_level.txt | 1 + README.rst | 7 +- mopidy_musicbox_webclient/__init__.py | 2 +- mopidy_musicbox_webclient/static/js/gui.js | 4 +- setup.py | 2 +- 12 files changed, 222 insertions(+), 6 deletions(-) create mode 100644 Mopidy_MusicBox_Webclient.egg-info/PKG-INFO create mode 100644 Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt create mode 100644 Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt create mode 100644 Mopidy_MusicBox_Webclient.egg-info/entry_points.txt create mode 100644 Mopidy_MusicBox_Webclient.egg-info/not-zip-safe create mode 100644 Mopidy_MusicBox_Webclient.egg-info/requires.txt create mode 100644 Mopidy_MusicBox_Webclient.egg-info/top_level.txt diff --git a/MANIFEST.in b/MANIFEST.in index e713a31..6c97bbd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,5 +4,4 @@ include MANIFEST.in include README.rst include mopidy_musicbox_webclient/ext.conf -recursive-include screenshots * recursive-include mopidy_musicbox_webclient/static * diff --git a/Mopidy_MusicBox_Webclient.egg-info/PKG-INFO b/Mopidy_MusicBox_Webclient.egg-info/PKG-INFO new file mode 100644 index 0000000..88db5b6 --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/PKG-INFO @@ -0,0 +1,96 @@ +Metadata-Version: 1.1 +Name: Mopidy-MusicBox-Webclient +Version: 1.0.1 +Summary: Mopidy MusicBox web extension +Home-page: https://github.com/woutervanwijk/mopidy-musicbox-webclient +Author: Wouter van Wijk +Author-email: woutervanwijk@gmail.com +License: GNU General Public License v3 (GPLv3) +Description: ************************* + Mopidy-MusicBox-Webclient + ************************* + + .. image:: https://img.shields.io/pypi/v/Mopidy-MusicBox-Webclient.svg?style=flat + :target: https://pypi.python.org/pypi/Mopidy-MusicBox-Webclient/ + :alt: Latest PyPI version + + .. image:: https://img.shields.io/pypi/dm/Mopidy-MusicBox-Webclient.svg?style=flat + :target: https://pypi.python.org/pypi/Mopidy-MusicBox-Webclient/ + :alt: Number of PyPI downloads + + With Mopidy MusicBox Webclient, you can play your music on your computer (`Rapsberry Pi `_) and remotely control it using your computer, tablet or phone. + + This is a responsive webclient especially written for Mopidy, a music server. Responsive, so it works on desktop and mobile browsers. You can browse, search and play albums, artists, playlists, and it has cover art from Last.fm. + + `Mopidy `_ is a music server which can play music from Spotify, Google Music, SoundCloud, etc or from your hard drive. + + If you want to run Mopidy with this webclient on a Raspberry Pi, do yourself a favor and use my custom built SD-image: `Pi MusicBox `_. + + .. image:: https://github.com/woutervanwijk/Mopidy-MusicBox-Webclient/raw/master/screenshots/playlists_desktop.png + + + Installation + ============ + + Install by running:: + + pip install Mopidy-MusicBox-Webclient + + + Alternatively, clone the repository and run ``sudo python setup.py install`` from within the project directory. e.g. :: + + $ git clone https://github.com/woutervanwijk/Mopidy-MusicBox-Webclient + $ cd Mopidy-MusicBox-Webclient + $ sudo python setup.py install + + + Usage + ===== + + Point your (modern) browser at Mopidy-MusicBox-Webclient running on your Mopidy server e.g. http://localhost:6680/musicbox. + + + + Project resources + ================= + + - `Source code `_ + - `Issue tracker `_ + - `Download development snapshot `_ + + + Changelog + ========= + + v1.0.1 (20-9-2014) + ------------------- + + - Small fixes for Pypi distro + + v1.0.0 (20-9-2014) + ------------------- + + - Compatible with Mopidy v0.19 + - Made pip installable + - A lot of fixes + - Works with mopidy-websettings extension + + v0.1.0 (2013-07-21) + ------------------- + + - Compatible with Mopidy 0.14+ + - More ways to add a song to the Queue (play next, add to bottom, etc) + - Better Queue popup + - Button to clear the Queue + - A bit more speed + - Local files show up in search + - Bugs fixed + - New instructions in the read me + +Platform: UNKNOWN +Classifier: Environment :: No Input/Output (Daemon) +Classifier: Intended Audience :: End Users/Desktop +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Operating System :: OS Independent +Classifier: Programming Language :: Python :: 2 +Classifier: Topic :: Multimedia :: Sound/Audio :: Players diff --git a/Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt b/Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt new file mode 100644 index 0000000..1e46c7a --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt @@ -0,0 +1,108 @@ +AUTHORS +LICENSE +MANIFEST.in +README.rst +setup.cfg +setup.py +Mopidy_MusicBox_Webclient.egg-info/PKG-INFO +Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt +Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt +Mopidy_MusicBox_Webclient.egg-info/entry_points.txt +Mopidy_MusicBox_Webclient.egg-info/not-zip-safe +Mopidy_MusicBox_Webclient.egg-info/requires.txt +Mopidy_MusicBox_Webclient.egg-info/top_level.txt +mopidy_musicbox_webclient/__init__.py +mopidy_musicbox_webclient/ext.conf +mopidy_musicbox_webclient/static/dialog-success.html +mopidy_musicbox_webclient/static/index.html +mopidy_musicbox_webclient/static/mb.manifest +mopidy_musicbox_webclient/static/system.html +mopidy_musicbox_webclient/static/css/add2home.css +mopidy_musicbox_webclient/static/css/font-awesome.css +mopidy_musicbox_webclient/static/css/font-awesome.min.css +mopidy_musicbox_webclient/static/css/iscroll-pull-icon@2x.png +mopidy_musicbox_webclient/static/css/jquery.mobile-1.3.1.css +mopidy_musicbox_webclient/static/css/jquery.mobile-1.3.1.min.css +mopidy_musicbox_webclient/static/css/jquery.mobile-1.4.0-alpha.2.css +mopidy_musicbox_webclient/static/css/jquery.mobile-1.4.0-alpha.2.min.css +mopidy_musicbox_webclient/static/css/jquery.mobile.flatui.css +mopidy_musicbox_webclient/static/css/jquery.mobile.flatui.min.css +mopidy_musicbox_webclient/static/css/jquery.mobile.iscrollview-pull.css +mopidy_musicbox_webclient/static/css/jquery.mobile.iscrollview.css +mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.3.1.css +mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.3.1.min.css +mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.4.0-alpha.2.css +mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.4.0-alpha.2.min.css +mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.3.1.css +mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.3.1.min.css +mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.4.0-alpha.2.css +mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.4.0-alpha.2.min.css +mopidy_musicbox_webclient/static/css/webclient.css +mopidy_musicbox_webclient/static/css/fonts/Flat-UI-Icons-24.ttf +mopidy_musicbox_webclient/static/css/fonts/Flat-UI-Icons-24.woff +mopidy_musicbox_webclient/static/css/fonts/FontAwesome.otf +mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.eot +mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.svg +mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.ttf +mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.woff +mopidy_musicbox_webclient/static/css/fonts/lato-black.ttf +mopidy_musicbox_webclient/static/css/fonts/lato-black.woff +mopidy_musicbox_webclient/static/css/fonts/lato-bold.ttf +mopidy_musicbox_webclient/static/css/fonts/lato-bold.woff +mopidy_musicbox_webclient/static/css/fonts/lato-italic.ttf +mopidy_musicbox_webclient/static/css/fonts/lato-italic.woff +mopidy_musicbox_webclient/static/css/fonts/lato-regular.ttf +mopidy_musicbox_webclient/static/css/fonts/lato-regular.woff +mopidy_musicbox_webclient/static/css/images/ajax-loader.gif +mopidy_musicbox_webclient/static/css/images/icons-18-black.png +mopidy_musicbox_webclient/static/css/images/icons-18-white.png +mopidy_musicbox_webclient/static/css/images/icons-36-black.png +mopidy_musicbox_webclient/static/css/images/icons-36-white.png +mopidy_musicbox_webclient/static/images/ajax-loader.gif +mopidy_musicbox_webclient/static/images/default_cover.png +mopidy_musicbox_webclient/static/images/empty.png +mopidy_musicbox_webclient/static/images/icons-18-black.png +mopidy_musicbox_webclient/static/images/icons-18-white.png +mopidy_musicbox_webclient/static/images/icons-36-black.png +mopidy_musicbox_webclient/static/images/icons-36-white.png +mopidy_musicbox_webclient/static/images/loader.gif +mopidy_musicbox_webclient/static/images/start.jpg +mopidy_musicbox_webclient/static/images/startup.png +mopidy_musicbox_webclient/static/images/user_24x32.png +mopidy_musicbox_webclient/static/images/icons/AUTHORS +mopidy_musicbox_webclient/static/images/icons/LICENSE +mopidy_musicbox_webclient/static/images/icons/cd_32x32.png +mopidy_musicbox_webclient/static/images/icons/musicbox114.png +mopidy_musicbox_webclient/static/images/icons/musicbox32.gif +mopidy_musicbox_webclient/static/images/icons/musicbox32.png +mopidy_musicbox_webclient/static/images/icons/musicbox57.png +mopidy_musicbox_webclient/static/images/icons/musicbox72.png +mopidy_musicbox_webclient/static/images/icons/pause_32x32.png +mopidy_musicbox_webclient/static/images/icons/play_alt_12x12.png +mopidy_musicbox_webclient/static/images/icons/play_alt_16x16.png +mopidy_musicbox_webclient/static/images/icons/play_alt_32x32.png +mopidy_musicbox_webclient/static/js/add2home.js +mopidy_musicbox_webclient/static/js/controls.js +mopidy_musicbox_webclient/static/js/fastclick.js +mopidy_musicbox_webclient/static/js/functionsvars.js +mopidy_musicbox_webclient/static/js/gui.js +mopidy_musicbox_webclient/static/js/iscroll-lite.js +mopidy_musicbox_webclient/static/js/iscroll.js +mopidy_musicbox_webclient/static/js/jquery-1.10.2.min.js +mopidy_musicbox_webclient/static/js/jquery-1.10.2.min.map +mopidy_musicbox_webclient/static/js/jquery.ba-hashchange.min.js +mopidy_musicbox_webclient/static/js/jquery.cookie.js +mopidy_musicbox_webclient/static/js/jquery.mobile-1.3.2.min.js +mopidy_musicbox_webclient/static/js/jquery.mobile-1.3.2.min.map +mopidy_musicbox_webclient/static/js/jquery.mobile.iscrollview-closure-min.js +mopidy_musicbox_webclient/static/js/jquery.mobile.iscrollview-yui-min.js +mopidy_musicbox_webclient/static/js/jquery.mobile.iscrollview.js +mopidy_musicbox_webclient/static/js/jquery.touchwipe.min.js +mopidy_musicbox_webclient/static/js/jquery.truncate.min.js +mopidy_musicbox_webclient/static/js/lastfm.api.cache.js +mopidy_musicbox_webclient/static/js/lastfm.api.js +mopidy_musicbox_webclient/static/js/lastfm.api.md5.js +mopidy_musicbox_webclient/static/js/lastfm.js +mopidy_musicbox_webclient/static/js/library.js +mopidy_musicbox_webclient/static/js/process_ws.js +mopidy_musicbox_webclient/static/js/radiostations.js \ No newline at end of file diff --git a/Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt b/Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt @@ -0,0 +1 @@ + diff --git a/Mopidy_MusicBox_Webclient.egg-info/entry_points.txt b/Mopidy_MusicBox_Webclient.egg-info/entry_points.txt new file mode 100644 index 0000000..25cd8b3 --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/entry_points.txt @@ -0,0 +1,3 @@ +[mopidy.ext] +musicbox_webclient = mopidy_musicbox_webclient:MusicBoxExtension + diff --git a/Mopidy_MusicBox_Webclient.egg-info/not-zip-safe b/Mopidy_MusicBox_Webclient.egg-info/not-zip-safe new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/not-zip-safe @@ -0,0 +1 @@ + diff --git a/Mopidy_MusicBox_Webclient.egg-info/requires.txt b/Mopidy_MusicBox_Webclient.egg-info/requires.txt new file mode 100644 index 0000000..277ae39 --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/requires.txt @@ -0,0 +1,2 @@ +setuptools +Mopidy >= 0.19 \ No newline at end of file diff --git a/Mopidy_MusicBox_Webclient.egg-info/top_level.txt b/Mopidy_MusicBox_Webclient.egg-info/top_level.txt new file mode 100644 index 0000000..8aec4ee --- /dev/null +++ b/Mopidy_MusicBox_Webclient.egg-info/top_level.txt @@ -0,0 +1 @@ +mopidy_musicbox_webclient diff --git a/README.rst b/README.rst index 72e5453..a024567 100644 --- a/README.rst +++ b/README.rst @@ -54,7 +54,12 @@ Project resources Changelog ========= -v1.0.0 +v1.0.1 (20-9-2014) +------------------- + +- Small fixes for Pypi distro + +v1.0.0 (20-9-2014) ------------------- - Compatible with Mopidy v0.19 diff --git a/mopidy_musicbox_webclient/__init__.py b/mopidy_musicbox_webclient/__init__.py index 5e12549..806dc39 100644 --- a/mopidy_musicbox_webclient/__init__.py +++ b/mopidy_musicbox_webclient/__init__.py @@ -5,7 +5,7 @@ import os from mopidy import config, ext -__version__ = '1.0.0' +__version__ = '1.0.1' class MusicBoxExtension(ext.Extension): diff --git a/mopidy_musicbox_webclient/static/js/gui.js b/mopidy_musicbox_webclient/static/js/gui.js index c4d677b..44d490d 100644 --- a/mopidy_musicbox_webclient/static/js/gui.js +++ b/mopidy_musicbox_webclient/static/js/gui.js @@ -120,8 +120,8 @@ function setSongInfo(data) { getCover(artiststext, data.album.name, '#infocover, #controlspopupimage', 'extralarge'); } else { $("#modalalbum").html(''); - $("#infocover").attr('src', '../images/default_cover.png'); - $("#controlspopupimage").attr('src', '../images/default_cover.png'); + $("#infocover").attr('src', 'images/default_cover.png'); + $("#controlspopupimage").attr('src', 'images/default_cover.png'); } $("#modalartist").html(arttmp); diff --git a/setup.py b/setup.py index b566fbf..a06411d 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ setup( ], entry_points={ 'mopidy.ext': [ - 'musicbox = mopidy_musicbox_webclient:MusicBoxExtension', + 'musicbox_webclient = mopidy_musicbox_webclient:MusicBoxExtension', ], }, classifiers=[ From d2a1659741b3ae54b296bff3f85bdcd1107b0267 Mon Sep 17 00:00:00 2001 From: woutervanwijk Date: Sat, 20 Sep 2014 00:26:10 +0200 Subject: [PATCH 5/8] add egg to gitignore --- .gitignore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e3a264c..1b83512 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,5 @@ mopidy.log* node_modules/ nosetests.xml .project - *.pbxproj - -Mopidy Webclient/Mopidy Webclient.xcodeproj/project.pbxproj +*.egg-info From 7c053981b7aa15e9269a90c8c247bd4003ed66eb Mon Sep 17 00:00:00 2001 From: woutervanwijk Date: Sat, 20 Sep 2014 00:27:47 +0200 Subject: [PATCH 6/8] removed egg dir --- Mopidy_MusicBox_Webclient.egg-info/PKG-INFO | 96 ---------------- .../SOURCES.txt | 108 ------------------ .../dependency_links.txt | 1 - .../entry_points.txt | 3 - .../not-zip-safe | 1 - .../requires.txt | 2 - .../top_level.txt | 1 - 7 files changed, 212 deletions(-) delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/PKG-INFO delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/entry_points.txt delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/not-zip-safe delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/requires.txt delete mode 100644 Mopidy_MusicBox_Webclient.egg-info/top_level.txt diff --git a/Mopidy_MusicBox_Webclient.egg-info/PKG-INFO b/Mopidy_MusicBox_Webclient.egg-info/PKG-INFO deleted file mode 100644 index 88db5b6..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/PKG-INFO +++ /dev/null @@ -1,96 +0,0 @@ -Metadata-Version: 1.1 -Name: Mopidy-MusicBox-Webclient -Version: 1.0.1 -Summary: Mopidy MusicBox web extension -Home-page: https://github.com/woutervanwijk/mopidy-musicbox-webclient -Author: Wouter van Wijk -Author-email: woutervanwijk@gmail.com -License: GNU General Public License v3 (GPLv3) -Description: ************************* - Mopidy-MusicBox-Webclient - ************************* - - .. image:: https://img.shields.io/pypi/v/Mopidy-MusicBox-Webclient.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-MusicBox-Webclient/ - :alt: Latest PyPI version - - .. image:: https://img.shields.io/pypi/dm/Mopidy-MusicBox-Webclient.svg?style=flat - :target: https://pypi.python.org/pypi/Mopidy-MusicBox-Webclient/ - :alt: Number of PyPI downloads - - With Mopidy MusicBox Webclient, you can play your music on your computer (`Rapsberry Pi `_) and remotely control it using your computer, tablet or phone. - - This is a responsive webclient especially written for Mopidy, a music server. Responsive, so it works on desktop and mobile browsers. You can browse, search and play albums, artists, playlists, and it has cover art from Last.fm. - - `Mopidy `_ is a music server which can play music from Spotify, Google Music, SoundCloud, etc or from your hard drive. - - If you want to run Mopidy with this webclient on a Raspberry Pi, do yourself a favor and use my custom built SD-image: `Pi MusicBox `_. - - .. image:: https://github.com/woutervanwijk/Mopidy-MusicBox-Webclient/raw/master/screenshots/playlists_desktop.png - - - Installation - ============ - - Install by running:: - - pip install Mopidy-MusicBox-Webclient - - - Alternatively, clone the repository and run ``sudo python setup.py install`` from within the project directory. e.g. :: - - $ git clone https://github.com/woutervanwijk/Mopidy-MusicBox-Webclient - $ cd Mopidy-MusicBox-Webclient - $ sudo python setup.py install - - - Usage - ===== - - Point your (modern) browser at Mopidy-MusicBox-Webclient running on your Mopidy server e.g. http://localhost:6680/musicbox. - - - - Project resources - ================= - - - `Source code `_ - - `Issue tracker `_ - - `Download development snapshot `_ - - - Changelog - ========= - - v1.0.1 (20-9-2014) - ------------------- - - - Small fixes for Pypi distro - - v1.0.0 (20-9-2014) - ------------------- - - - Compatible with Mopidy v0.19 - - Made pip installable - - A lot of fixes - - Works with mopidy-websettings extension - - v0.1.0 (2013-07-21) - ------------------- - - - Compatible with Mopidy 0.14+ - - More ways to add a song to the Queue (play next, add to bottom, etc) - - Better Queue popup - - Button to clear the Queue - - A bit more speed - - Local files show up in search - - Bugs fixed - - New instructions in the read me - -Platform: UNKNOWN -Classifier: Environment :: No Input/Output (Daemon) -Classifier: Intended Audience :: End Users/Desktop -Classifier: License :: OSI Approved :: Apache Software License -Classifier: Operating System :: OS Independent -Classifier: Programming Language :: Python :: 2 -Classifier: Topic :: Multimedia :: Sound/Audio :: Players diff --git a/Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt b/Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt deleted file mode 100644 index 1e46c7a..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt +++ /dev/null @@ -1,108 +0,0 @@ -AUTHORS -LICENSE -MANIFEST.in -README.rst -setup.cfg -setup.py -Mopidy_MusicBox_Webclient.egg-info/PKG-INFO -Mopidy_MusicBox_Webclient.egg-info/SOURCES.txt -Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt -Mopidy_MusicBox_Webclient.egg-info/entry_points.txt -Mopidy_MusicBox_Webclient.egg-info/not-zip-safe -Mopidy_MusicBox_Webclient.egg-info/requires.txt -Mopidy_MusicBox_Webclient.egg-info/top_level.txt -mopidy_musicbox_webclient/__init__.py -mopidy_musicbox_webclient/ext.conf -mopidy_musicbox_webclient/static/dialog-success.html -mopidy_musicbox_webclient/static/index.html -mopidy_musicbox_webclient/static/mb.manifest -mopidy_musicbox_webclient/static/system.html -mopidy_musicbox_webclient/static/css/add2home.css -mopidy_musicbox_webclient/static/css/font-awesome.css -mopidy_musicbox_webclient/static/css/font-awesome.min.css -mopidy_musicbox_webclient/static/css/iscroll-pull-icon@2x.png -mopidy_musicbox_webclient/static/css/jquery.mobile-1.3.1.css -mopidy_musicbox_webclient/static/css/jquery.mobile-1.3.1.min.css -mopidy_musicbox_webclient/static/css/jquery.mobile-1.4.0-alpha.2.css -mopidy_musicbox_webclient/static/css/jquery.mobile-1.4.0-alpha.2.min.css -mopidy_musicbox_webclient/static/css/jquery.mobile.flatui.css -mopidy_musicbox_webclient/static/css/jquery.mobile.flatui.min.css -mopidy_musicbox_webclient/static/css/jquery.mobile.iscrollview-pull.css -mopidy_musicbox_webclient/static/css/jquery.mobile.iscrollview.css -mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.3.1.css -mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.3.1.min.css -mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.4.0-alpha.2.css -mopidy_musicbox_webclient/static/css/jquery.mobile.structure-1.4.0-alpha.2.min.css -mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.3.1.css -mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.3.1.min.css -mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.4.0-alpha.2.css -mopidy_musicbox_webclient/static/css/jquery.mobile.theme-1.4.0-alpha.2.min.css -mopidy_musicbox_webclient/static/css/webclient.css -mopidy_musicbox_webclient/static/css/fonts/Flat-UI-Icons-24.ttf -mopidy_musicbox_webclient/static/css/fonts/Flat-UI-Icons-24.woff -mopidy_musicbox_webclient/static/css/fonts/FontAwesome.otf -mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.eot -mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.svg -mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.ttf -mopidy_musicbox_webclient/static/css/fonts/fontawesome-webfont.woff -mopidy_musicbox_webclient/static/css/fonts/lato-black.ttf -mopidy_musicbox_webclient/static/css/fonts/lato-black.woff -mopidy_musicbox_webclient/static/css/fonts/lato-bold.ttf -mopidy_musicbox_webclient/static/css/fonts/lato-bold.woff -mopidy_musicbox_webclient/static/css/fonts/lato-italic.ttf -mopidy_musicbox_webclient/static/css/fonts/lato-italic.woff -mopidy_musicbox_webclient/static/css/fonts/lato-regular.ttf -mopidy_musicbox_webclient/static/css/fonts/lato-regular.woff -mopidy_musicbox_webclient/static/css/images/ajax-loader.gif -mopidy_musicbox_webclient/static/css/images/icons-18-black.png -mopidy_musicbox_webclient/static/css/images/icons-18-white.png -mopidy_musicbox_webclient/static/css/images/icons-36-black.png -mopidy_musicbox_webclient/static/css/images/icons-36-white.png -mopidy_musicbox_webclient/static/images/ajax-loader.gif -mopidy_musicbox_webclient/static/images/default_cover.png -mopidy_musicbox_webclient/static/images/empty.png -mopidy_musicbox_webclient/static/images/icons-18-black.png -mopidy_musicbox_webclient/static/images/icons-18-white.png -mopidy_musicbox_webclient/static/images/icons-36-black.png -mopidy_musicbox_webclient/static/images/icons-36-white.png -mopidy_musicbox_webclient/static/images/loader.gif -mopidy_musicbox_webclient/static/images/start.jpg -mopidy_musicbox_webclient/static/images/startup.png -mopidy_musicbox_webclient/static/images/user_24x32.png -mopidy_musicbox_webclient/static/images/icons/AUTHORS -mopidy_musicbox_webclient/static/images/icons/LICENSE -mopidy_musicbox_webclient/static/images/icons/cd_32x32.png -mopidy_musicbox_webclient/static/images/icons/musicbox114.png -mopidy_musicbox_webclient/static/images/icons/musicbox32.gif -mopidy_musicbox_webclient/static/images/icons/musicbox32.png -mopidy_musicbox_webclient/static/images/icons/musicbox57.png -mopidy_musicbox_webclient/static/images/icons/musicbox72.png -mopidy_musicbox_webclient/static/images/icons/pause_32x32.png -mopidy_musicbox_webclient/static/images/icons/play_alt_12x12.png -mopidy_musicbox_webclient/static/images/icons/play_alt_16x16.png -mopidy_musicbox_webclient/static/images/icons/play_alt_32x32.png -mopidy_musicbox_webclient/static/js/add2home.js -mopidy_musicbox_webclient/static/js/controls.js -mopidy_musicbox_webclient/static/js/fastclick.js -mopidy_musicbox_webclient/static/js/functionsvars.js -mopidy_musicbox_webclient/static/js/gui.js -mopidy_musicbox_webclient/static/js/iscroll-lite.js -mopidy_musicbox_webclient/static/js/iscroll.js -mopidy_musicbox_webclient/static/js/jquery-1.10.2.min.js -mopidy_musicbox_webclient/static/js/jquery-1.10.2.min.map -mopidy_musicbox_webclient/static/js/jquery.ba-hashchange.min.js -mopidy_musicbox_webclient/static/js/jquery.cookie.js -mopidy_musicbox_webclient/static/js/jquery.mobile-1.3.2.min.js -mopidy_musicbox_webclient/static/js/jquery.mobile-1.3.2.min.map -mopidy_musicbox_webclient/static/js/jquery.mobile.iscrollview-closure-min.js -mopidy_musicbox_webclient/static/js/jquery.mobile.iscrollview-yui-min.js -mopidy_musicbox_webclient/static/js/jquery.mobile.iscrollview.js -mopidy_musicbox_webclient/static/js/jquery.touchwipe.min.js -mopidy_musicbox_webclient/static/js/jquery.truncate.min.js -mopidy_musicbox_webclient/static/js/lastfm.api.cache.js -mopidy_musicbox_webclient/static/js/lastfm.api.js -mopidy_musicbox_webclient/static/js/lastfm.api.md5.js -mopidy_musicbox_webclient/static/js/lastfm.js -mopidy_musicbox_webclient/static/js/library.js -mopidy_musicbox_webclient/static/js/process_ws.js -mopidy_musicbox_webclient/static/js/radiostations.js \ No newline at end of file diff --git a/Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt b/Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Mopidy_MusicBox_Webclient.egg-info/entry_points.txt b/Mopidy_MusicBox_Webclient.egg-info/entry_points.txt deleted file mode 100644 index 25cd8b3..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[mopidy.ext] -musicbox_webclient = mopidy_musicbox_webclient:MusicBoxExtension - diff --git a/Mopidy_MusicBox_Webclient.egg-info/not-zip-safe b/Mopidy_MusicBox_Webclient.egg-info/not-zip-safe deleted file mode 100644 index 8b13789..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/not-zip-safe +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Mopidy_MusicBox_Webclient.egg-info/requires.txt b/Mopidy_MusicBox_Webclient.egg-info/requires.txt deleted file mode 100644 index 277ae39..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/requires.txt +++ /dev/null @@ -1,2 +0,0 @@ -setuptools -Mopidy >= 0.19 \ No newline at end of file diff --git a/Mopidy_MusicBox_Webclient.egg-info/top_level.txt b/Mopidy_MusicBox_Webclient.egg-info/top_level.txt deleted file mode 100644 index 8aec4ee..0000000 --- a/Mopidy_MusicBox_Webclient.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -mopidy_musicbox_webclient From 99ab2dbfb8d1d9bc4563575676fcf8f2b18825c8 Mon Sep 17 00:00:00 2001 From: woutervanwijk Date: Mon, 22 Sep 2014 00:16:25 +0200 Subject: [PATCH 7/8] make reboot/update work with mopidy-websettings --- mopidy_musicbox_webclient/static/js/controls.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mopidy_musicbox_webclient/static/js/controls.js b/mopidy_musicbox_webclient/static/js/controls.js index 3502144..825974e 100644 --- a/mopidy_musicbox_webclient/static/js/controls.js +++ b/mopidy_musicbox_webclient/static/js/controls.js @@ -612,13 +612,13 @@ function saveRadioStations() { } function haltSystem() { - $.post("/haltSystem"); + $.post("/settings/shutdown"); toast('Stopping system...', 10000); setTimeout(function(){window.history.back();}, 10000); } function rebootSystem() { - $.post("/rebootSystem"); + $.post("/settings/reboot"); toast('Rebooting...', 10000); setTimeout(function(){window.history.back();}, 10000); } From 1a394999068a1e25e8e44d4a2e0ea47b624a8ee6 Mon Sep 17 00:00:00 2001 From: woutervanwijk Date: Tue, 23 Sep 2014 13:08:01 +0200 Subject: [PATCH 8/8] search a service, youtube support, bugfix - Search: select service to search in - Youtube icons - Fixed single quote bug #39 --- AUTHORS | 1 + README.rst | 7 ++ mopidy_musicbox_webclient/__init__.py | 2 +- mopidy_musicbox_webclient/static/index.html | 3 + .../static/js/functionsvars.js | 10 +-- .../static/js/library.js | 70 ++++++++++++------- 6 files changed, 63 insertions(+), 30 deletions(-) diff --git a/AUTHORS b/AUTHORS index ff4fdd8..ba92d46 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ Webclient - Wouter van Wijk - Flat Interface: Ulrich Lichtenegger - Kingosticks +- Szymon Nowak Mopidy: https://github.com/mopidy/mopidy/blob/develop/AUTHORS diff --git a/README.rst b/README.rst index a024567..a3b5b64 100644 --- a/README.rst +++ b/README.rst @@ -54,6 +54,13 @@ Project resources Changelog ========= +v1.0.2 Dev +------------------- + +- Search: select service to search in +- Youtube icons +- Fixed single quote bug #39 + v1.0.1 (20-9-2014) ------------------- diff --git a/mopidy_musicbox_webclient/__init__.py b/mopidy_musicbox_webclient/__init__.py index 806dc39..d517b27 100644 --- a/mopidy_musicbox_webclient/__init__.py +++ b/mopidy_musicbox_webclient/__init__.py @@ -5,7 +5,7 @@ import os from mopidy import config, ext -__version__ = '1.0.1' +__version__ = '1.0.2' class MusicBoxExtension(ext.Extension): diff --git a/mopidy_musicbox_webclient/static/index.html b/mopidy_musicbox_webclient/static/index.html index 928e9f8..b77bf42 100644 --- a/mopidy_musicbox_webclient/static/index.html +++ b/mopidy_musicbox_webclient/static/index.html @@ -283,6 +283,9 @@
+