Merge pull request #66 from jcorporation/devel

Merge devel into master for 4.3.1 release
jcorporation · Oct 10, 2018 · ab7bde5 · ab7bde5
2 parents 2eeddc9 + bfec07c
commit ab7bde5
Show file tree

Hide file tree

Showing 21 changed files with 511 additions and 382 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project (mympd C)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "4")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
 
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
     set(ASSETS_PATH "/usr/share/${PROJECT_NAME}/htdocs")
@@ -31,6 +31,7 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS NS_ENABLE_SSL)
 set(SOURCES
     src/mympd.c
     src/mpd_client.c
+    src/list.c
     dist/src/mongoose/mongoose.c
     dist/src/frozen/frozen.c
     dist/src/inih/ini.c

diff --git a/PKGBUILD b/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=mympd
 _pkgname=myMPD
-pkgver=4.3.0
+pkgver=4.3.1
 pkgrel=1
-pkgdesc="A standalone MPD Web GUI based on YMPD - Default port set to 80"
+pkgdesc="myMPD is a standalone and mobile friendly web mpdclient."
 arch=('x86_64' 'armv7h' 'aarch64')
 url="http://github.org/jcorporation/myMPD"
 license=('GPL')

diff --git a/contrib/archlinux.install b/contrib/archlinux.install
@@ -10,10 +10,6 @@ post_upgrade() {
   getent passwd mympd > /dev/null
   [ "$?" = "2" ] && useradd --system -d /var/lib/mympd -s /usr/sbin/nologin -g mympd mympd
 
-  # fix ownership of /var/lib/mympd
-  echo "INFO: Fixing ownership of /var/lib/mympd"
-  chown -R mympd.mympd /var/lib/mympd
-
   # link music directory to mympd if not already exising 
   echo "INFO: Trying to link musicdir to library"
   if [ -f /etc/mpd.conf ]
@@ -64,6 +60,17 @@ post_upgrade() {
     fi
   done
 
+  #default state files
+  [ -f /var/lib/mympd/state/jukeboxMode ] || echo -n "0" > /var/lib/mympd/state/jukeboxMode
+  [ -f /var/lib/mympd/state/jukeboxPlaylist ] || echo -n "Database" > /var/lib/mympd/state/jukeboxPlaylist
+  [ -f /var/lib/mympd/state/jukeboxQueueLength ] || echo -n "1" > /var/lib/mympd/state/jukeboxQueueLength
+  [ -f /var/lib/mympd/state/notificationPage ] || echo -n "true" > /var/lib/mympd/state/notificationPage
+  [ -f /var/lib/mympd/state/notificationWeb ] || echo -n "false" > /var/lib/mympd/state/notificationWeb
+
+  # fix ownership of /var/lib/mympd
+  echo "INFO: Fixing ownership of /var/lib/mympd"
+  chown -R mympd.mympd /var/lib/mympd
+
   # move config into place unless already existing
   if [ ! -f /etc/mympd/mympd.conf ]
   then 

diff --git a/contrib/myMPD.spec b/contrib/myMPD.spec
@@ -4,13 +4,13 @@
 # (c) 2018 Juergen Mang <mail@jcgames.de>
 
 Name:           myMPD
-Version:        4.3.0
+Version:        4.3.1
 Release:        0 
 License:        GPL-2.0 
 Group:          Productivity/Multimedia/Sound/Players
 Summary:        Standalone webclient for mpd
 Url:            https://github.com/jcorporation/myMPD
-Source:         https://github.com/jcorporation/myMPD/archive/v4.3.0.zip
+Source:         https://github.com/jcorporation/myMPD/archive/v%{version}.zip
 BuildRequires:  gcc
 BuildRequires:  cmake
 BuildRequires:  unzip
@@ -44,9 +44,6 @@ getent group mympd > /dev/null
 getent passwd mympd > /dev/null
 [ "$?" = "2" ] && useradd -r mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
 
-echo "Fixing ownership of /var/lib/mympd"
-chown -R mympd.mympd /var/lib/mympd
-
 if [ -d /etc/systemd ]
 then
   [ -d /usr/lib/systemd/system ] || mkdir -p /usr/lib/systemd/system 
@@ -78,6 +75,16 @@ do
   fi
 done
 
+#default state files
+[ -f /var/lib/mympd/state/jukeboxMode ] || echo -n "0" > /var/lib/mympd/state/jukeboxMode
+[ -f /var/lib/mympd/state/jukeboxPlaylist ] || echo -n "Database" > /var/lib/mympd/state/jukeboxPlaylist
+[ -f /var/lib/mympd/state/jukeboxQueueLength ] || echo -n "1" > /var/lib/mympd/state/jukeboxQueueLength
+[ -f /var/lib/mympd/state/notificationPage ] || echo -n "true" > /var/lib/mympd/state/notificationPage
+[ -f /var/lib/mympd/state/notificationWeb ] || echo -n "false" > /var/lib/mympd/state/notificationWeb
+
+echo "Fixing ownership of /var/lib/mympd"
+chown -R mympd.mympd /var/lib/mympd
+
 # move config into place unless already existing
 if [ ! -f /etc/mympd/mympd.conf ]
 then 

diff --git a/contrib/mympd.1 b/contrib/mympd.1
@@ -1,18 +1,18 @@
 .\" Manpage for myMPD.
 .\" Contact mail@jcgames.de to correct errors or typos.
-.TH man 1 "22 Aug 2018" "4.0.0" "myMPD man page"
+.TH man 1 "02 Oct 2018" "4.3.1" "myMPD man page"
 .SH NAME
-myMPD \- Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS
+myMPD \- myMPD is a standalone and mobile friendly web mpdclient 
 .SH SYNOPSIS
 mympd /path/to/mympd.conf
 .SH DESCRIPTION
-myMPD is a lightweight MPD web client that runs without a dedicated webserver or interpreter. 
-It's tuned for minimal resource usage and requires only very litte dependencies. 
-myMPD is a fork of ympd.
+myMPD is a lightweight MPD web client that runs without a dedicated webserver or interpreter. It's tuned for minimal resource usage and requires only very litte dependencies.
+myMPD is a fork of ympd (https://github.com/notandy/ympd).
+This fork provides a reworked ui based on Bootstrap 4, a modernized backend and many new features while having the same small footprint as ympd.
 
 .SH BUGS
 No known bugs.
 .SH AUTHOR
 Juergen Mang (mail@jcgames.de)
 
-https://github.com/jcorporation/mympd
+https://github.com/jcorporation/mympd
diff --git a/contrib/mympd.conf.dist b/contrib/mympd.conf.dist
@@ -33,7 +33,6 @@ mixramp = false
 stickers = true
 
 #List of tags in myMPD gui
-#Supported tags: Artist,Album,AlbumArtist,Title,Track,Genre,Date,Composer,Performer
 taglist = Artist,Album,AlbumArtist,Title,Track,Genre,Date,Composer,Performer
 
 #Enable smart playlists

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-mympd (4.3.0-1) stable; urgency=medium
+mympd (4.3.1-1) stable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <mail@jcgames.de>  Tue, 25 Sep 2018 00:35:00 +0200
+ -- Juergen Mang <mail@jcgames.de>  Mon, 02 Oct 2018 00:04:00 +0200
diff --git a/debian/postinst b/debian/postinst
@@ -6,8 +6,7 @@ getent group mympd > /dev/null
 getent passwd mympd > /dev/null
 [ "$?" = "2" ] && useradd -r mympd -g mympd -d /var/lib/mympd -s /usr/sbin/nologin
 
-echo "Fixing ownership of /var/lib/mympd"
-chown -R mympd.mympd /var/lib/mympd
+
 
 echo "Trying to link musicdir to library"
 if [ -f /etc/mpd.conf ]
@@ -48,7 +47,6 @@ do
   fi
 done
 
-
 # move config into place unless already existing
 if [ ! -f /etc/mympd/mympd.conf ]
 then 
@@ -57,6 +55,16 @@ else
   echo "mympd.conf installed as mympd.conf.dist"
 fi
 
+#default state files
+[ -f /var/lib/mympd/state/jukeboxMode ] || echo -n "0" > /var/lib/mympd/state/jukeboxMode
+[ -f /var/lib/mympd/state/jukeboxPlaylist ] || echo -n "Database" > /var/lib/mympd/state/jukeboxPlaylist
+[ -f /var/lib/mympd/state/jukeboxQueueLength ] || echo -n "1" > /var/lib/mympd/state/jukeboxQueueLength
+[ -f /var/lib/mympd/state/notificationPage ] || echo -n "true" > /var/lib/mympd/state/notificationPage
+[ -f /var/lib/mympd/state/notificationWeb ] || echo -n "false" > /var/lib/mympd/state/notificationWeb
+
+echo "Fixing ownership of /var/lib/mympd"
+chown -R mympd.mympd /var/lib/mympd
+
 if [ -d /etc/mympd/ssl ]
 then
   echo "Certificates already created"

diff --git a/dist/htdocs/index.html b/dist/htdocs/index.html