Merge branch 'mongoose'

.drone.yml

@@ -0,0 +1,17 @@
+image: gcc4.8
+script:
+  - sudo apt-get install -y libmpdclient-dev &> /dev/null
+  - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Debug
+  - make VERBOSE=1 
+notify:
+  email:
+    recipients:
+      - [email protected]
+  irc:
+    server: irc.freenode.org
+    nick: droneBot
+    channel: '#nicotest'
+    on_started: true
+    on_success: true
+    on_failure: true
+

CMakeLists.txt

@@ -3,55 +3,51 @@ cmake_minimum_required(VERSION 2.6)
 project (ympd)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_MINOR "2")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_GENERATOR "DEB;RPM;TGZ")
-set(CPACK_SOURCE_GENERATOR "TBZ2")
-set(DEBIAN_PACKAGE_SECTION "web")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD web client based on Websockets and Bootstrap")
-set(CPACK_PACKAGE_CONTACT "Andrew Karpow <[email protected]>")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "[email protected]")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl1.0.0,libmpdclient2")
-
-option(WITH_STATIC_WEBSOCKETS "Build with static libwebsockets library" ON)
+
 option(WITH_MPD_HOST_CHANGE "Let users of the web frontend change the MPD Host" ON)
 
 find_package(LibMPDClient REQUIRED)
-find_package(LibWebSockets REQUIRED)
-if(WITH_STATIC_WEBSOCKETS)
-    find_package(OpenSSL REQUIRED)
-    find_package(ZLIB REQUIRED)
-endif()
+find_package(Threads REQUIRED)
 
-configure_file(${PROJECT_SOURCE_DIR}/src/config.h.in
-    ${PROJECT_BINARY_DIR}/config.h)
-include_directories(${PROJECT_BINARY_DIR} ${LIBWEBSOCKETS_INCLUDE_DIR})
+configure_file(src/config.h.in ${PROJECT_BINARY_DIR}/config.h)
+include_directories(${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
 
 include(CheckCSourceCompiles)
-include(CPack)
 
 set(CMAKE_C_FLAGS "-std=gnu99 -Wall") 
 set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic")
 
+file(GLOB RESOURCES 
+	RELATIVE ${PROJECT_SOURCE_DIR}
+	htdocs/js/*
+	htdocs/assets/*
+	htdocs/css/*.min.css
+	htdocs/fonts/*
+	htdocs/index.html
+)
+
+add_executable(mkdata htdocs/mkdata.c)
+get_target_property(MKDATA_EXE mkdata LOCATION)
+
+add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c
+    COMMAND ${MKDATA_EXE} ${RESOURCES} > ${PROJECT_BINARY_DIR}/assets.c
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+    DEPENDS ${RESOURCES}
+)
+
 set(SOURCES
     src/ympd.c
     src/http_server.c
     src/mpd_client.c
+    src/mongoose.c
+    src/json_encode.c
+    assets.c
 )
 
 add_executable(ympd ${SOURCES})
-
-# TODO: use generator expressions introduced to CMake 2.8.12, too fresh yet
-if(WITH_STATIC_WEBSOCKETS)
-    find_library(LIBWEBSOCKETS_LIBRARY_STATIC libwebsockets.a)
-    target_link_libraries(ympd ${LIBMPDCLIENT_LIBRARY}
-        ${LIBWEBSOCKETS_LIBRARY_STATIC} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
-else()
-    target_link_libraries(ympd ${LIBMPDCLIENT_LIBRARY}
-        ${LIBWEBSOCKETS_LIBRARIES})
-endif()
-
+target_link_libraries(ympd ${LIBMPDCLIENT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 
 install(TARGETS ympd DESTINATION bin)
 install(FILES ympd.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-install(DIRECTORY htdocs DESTINATION share/${PROJECT_NAME})

README.md

@@ -1,26 +1,27 @@
 ympd
 ====
+[![Build Status](http://ci.ympd.org/github.com/notandy/ympd/status.png?branch=mongoose)](https://ci.ympd.org/github.com/notandy/ympd)
 
 Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
 
+
 http://www.ympd.org
 
+![ScreenShot](http://www.ympd.org/assets/ympd_github.png)
 
 Dependencies
 ------------
- - libwebsockets master branch: http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets
  - libmpdclient 2: http://www.musicpd.org/libs/libmpdclient/
  - cmake 2.6: http://cmake.org/
- - Optional: OpenSSL for SSL support in libwebsockets webserver
 
 Unix Build Instructions
 -----------------------
 
-1. Install Dependencies, cmake, openssl and libmpdclient are available from all major distributions.
+1. Install Dependencies, cmake and libmpdclient are available from all major distributions.
 2. create build directory ```cd /path/to/src; mkdir build; cd build```
 3. create makefile ```cmake ..  -DCMAKE_INSTALL_PREFIX:PATH=/usr```
 4. build ```make```
-5. install ```sudo make install``` or build debian package ```cpack -G DEB; sudo dpkg -i ympd*.deb```
+5. install ```sudo make install``` or just run with ```./ympd```
 
 Copyright
 ---------

contrib/init.debian

@@ -21,8 +21,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 LOG_OUT=/var/log/$NAME.out
 LOG_ERR=/var/log/$NAME.err
 YMPD_USER=mpd
-YMPD_GROUP=mpd
-DAEMON_OPT="--uid $YMPD_USER --gid $YMPD_GROUP --webport 80"
+DAEMON_OPT="--user $YMPD_USER --webport 80"
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0

htdocs/css/mpd.css

@@ -28,6 +28,10 @@ body {
 	min-width: 50px;
 }
 
+#search {
+  margin-right: -10px;
+}
+
 .btn-group-hover {
     opacity: 20%;
 }

htdocs/index.html

@@ -10,10 +10,11 @@
   <title>ympd</title>
 
   <!-- Bootstrap core CSS -->
-  <link href="css/bootstrap.css" rel="stylesheet">
+  <link href="css/bootstrap.min.css" rel="stylesheet">
+  <link href="css/bootstrap-theme.min.css" rel="stylesheet">
 
   <!-- Custom styles for this template -->
-  <link href="css/mpd.css" rel="stylesheet">
+  <link href="css/mpd.min.css" rel="stylesheet">
   <link href="assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon">
 
   <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -37,9 +38,8 @@
       <div class="collapse navbar-collapse">
 
         <ul id="nav_links" class="nav navbar-nav">
-          <li id="playlist"><a href="#/">Playlist</a></li>
-          <li id="browse"><a href="#/browse/">Browse database</a></li>
-          <li><a href="#" data-toggle="modal" data-target="#about" onclick="getVersion();">About</a></li>
+          <li id="queue"><a href="#/">Queue</a></li>
+          <li id="browse"><a href="#/browse/0/">Browse database</a></li>
           <li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
         </ul>
 
@@ -65,6 +65,11 @@
             </div>
           </div>
         </div>
+        <form id="search" class="navbar-form navbar-right" role="search">
+          <div class="form-group">
+            <input type="text" class="form-control" placeholder="Search">
+          </div>
+        </form>
       </div><!--/.nav-collapse -->
     </div>
   </div>
@@ -77,7 +82,7 @@
 
         <div class="panel panel-primary">
           <!-- Default panel contents -->
-          <div id="panel-heading" class="panel-heading">Playlist</div>
+          <div class="panel-heading"><b id="panel-heading">Queue</b></div>
           <div class="panel-body">
             <h1>
               <span id="track-icon" class="glyphicon glyphicon-play"></span>
@@ -111,6 +116,10 @@ <h4>
             </tbody>
           </table>
         </div><!-- /.panel -->
+        <ul class="pager">
+          <li id="prev" class="page-btn hide"><a href="">Previous</a></li>
+          <li id="next" class="page-btn"><a href="">Next</a></li>
+        </ul>
       </div><!-- /.col-md-10 -->
 
       <div class="col-md-2 col-xs-12" >
@@ -150,42 +159,21 @@ <h4>
   </div><!-- /.container -->
 
   <!-- Modal -->
-  <div class="modal fade" id="about" tabindex="-1" role="dialog" aria-labelledby="aboutLabel" aria-hidden="true">
+  <div class="modal fade" id="settings" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h2 class="modal-title" id="aboutLabel">About</h2>
+          <h2 class="modal-title" id="settingsLabel"><span class="glyphicon glyphicon-wrench"></span> Settings</h2>
         </div>
         <div class="modal-body">
           <h4><a href="http://www.ympd.org"><span class="glyphicon glyphicon-play-circle"></span> ympd</a>&nbsp;&nbsp;&nbsp;<small>MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS</small></h4>
           <p>
           ympd is a lightweight MPD (Music Player Daemon) web client that runs without a dedicated werbserver or interpreters like PHP, NodeJS or Ruby. It's tuned for minimal resource usage and requires only very litte dependencies.</p>
-          <p class="text-muted">
-          ympd <span id="ympd_version"></span><br/>
-          libmpdclient <span id="mpd_version"></span><br/>
-          </p>
           <h5>ympd uses following excellent software:</h5>
-          <h6><a href="http://libwebsockets.org">libWebSockets</a> <small>LGPL2.1 + static link exception</small></h6>
+          <h6><a href="http://cesanta.com/docs.html">Mongoose</a> <small>GPLv2</small></h6>
           <h6><a href="http://www.musicpd.org/libs/libmpdclient/">libMPDClient</a> <small>BSD License</small></h6>
-          <br/>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-
-  <!-- Modal -->
-  <div class="modal fade" id="settings" tabindex="-1" role="dialog" aria-labelledby="settingsLabel" aria-hidden="true">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h2 class="modal-title" id="settingsLabel"><span class="glyphicon glyphicon-wrench"></span> Settings</h2>
-        </div>
-        <div class="modal-body">
+          <hr />
           <form role="form">
             <div class="row">
               <div class="form-group col-md-9">
@@ -197,16 +185,51 @@ <h2 class="modal-title" id="settingsLabel"><span class="glyphicon glyphicon-wren
                 <input type="text" class="form-control" id="mpdport" />
               </div>
             </div>
+            <div class="row">
+              <div class="form-group col-md-6">
+                <label class="control-label" for="mpd_pw">MPD Password</label>
+                <input type="password" class="form-control" id="mpd_pw" placeholder="Password"/>
+              </div>
+              <div class="form-group col-md-6">
+                <label class="control-label" for="mpd_pw_con">MPD Password (Confirmation)</label>
+                <input type="password" class="form-control" id="mpd_pw_con"  placeholder="Password confirmation"
+                data-placement="right" data-toggle="popover" data-content="Password does not match!"
+                data-trigger="manual" />
+              </div>
+              <div class="form-group col-md-12">
+                <div id="mpd_password_set" class="hide alert alert-info">
+                  <button type="button" class="close" aria-hidden="true">&times;</button>
+                  MPD Password is set
+                </div>
+              </div>
+
+            </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-          <button type="button" class="btn btn-default" data-dismiss="modal" onclick="setHost();">Save</button>
+          <button type="button" class="btn btn-default" onclick="confirmSettings();">Save</button>
         </div>
       </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
   </div><!-- /.modal -->
 
+  <div class="modal fade bs-example-modal-sm" id="wait" tabindex="-1" role="dialog" data-backdrop="static" data-keyboard="false" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h1>Searching...</h1>
+        </div>
+        <div class="modal-body">
+          <div class="progress progress-striped active">
+            <div class="progress-bar"  role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
+              <span class="sr-only">Please Wait</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 
 
   <!-- Bootstrap core JavaScript