Merge branch 'devel'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,8 +14,8 @@ A clear and concise description of what the bug is.
 
 Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error
 
 **Expected behavior**
@@ -38,7 +38,7 @@ If applicable, add screenshots to help explain your problem.
  - Browser [e.g. chrome, safari]
  - Browser version [e.g. 22]
 
-**Debug logs (please attach if it can be usefull)**
+**Debug logs (please attach if it can be useful)**
 
 Look at https://jcorporation.github.io/myMPD/debug
 
@@ -47,7 +47,7 @@ Look at https://jcorporation.github.io/myMPD/debug
  - Browser error console
  - Browser network console
 
-**Configuration (please attach if it can be usefull)**
+**Configuration (please attach if it can be useful)**
 
  - tarball of /var/lib/mympd/state (``tar -cf mympd_state.tar /var/lib/mympd/state``)
  - tarball of /var/lib/mympd/config (``tar -cf mympd_config.tar /var/lib/mympd/config``)

CHANGELOG.md

@@ -4,6 +4,20 @@ https://github.com/jcorporation/myMPD/
 
 ***
 
+## myMPD v10.1.1 (2022-11-13)
+
+This is a small bugfix release.
+
+### Changelog
+
+- Feat: add es-ES translation
+- Upd: translations
+- Upd: man pages
+- Fix: remove song progress indicator in queue view after switching to new song #881
+- Fix: arch, gentoo and rpm packaging #886 #887
+
+***
+
 ## myMPD v10.1.0 (2022-11-06)
 
 This minor release adds support of new MPD 0.24 features. The javascript frontend is now documented with jsDoc and linted with the typescript compiler.

CMakeLists.txt

@@ -8,13 +8,10 @@ cmake_policy(SET CMP0003 NEW)
 
 # myMPD is written in C
 # supported compilers: gcc, clang
-project(mympd C)
-
-# update myMPD version here and run ./build.sh setversion to update
-# the source files
-set(CPACK_PACKAGE_VERSION_MAJOR "10")
-set(CPACK_PACKAGE_VERSION_MINOR "1")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+project(mympd
+  VERSION 10.1.1
+  LANGUAGES C
+)
 
 # output binaries in bin directory
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -196,6 +193,9 @@ if(MYMPD_EMBEDDED_ASSETS)
   if(EXISTS "${PROJECT_BINARY_DIR}/htdocs/assets/i18n/en-US.json.gz")
     set(I18N_en_US "ON")
   endif()
+  if(EXISTS "${PROJECT_BINARY_DIR}/htdocs/assets/i18n/es-ES.json.gz")
+    set(I18N_es_ES "ON")
+  endif()
   if(EXISTS "${PROJECT_BINARY_DIR}/htdocs/assets/i18n/es-VE.json.gz")
     set(I18N_es_VE "ON")
   endif()
@@ -232,28 +232,28 @@ configure_file(contrib/initscripts/mympd.openrc.in contrib/initscripts/mympd.ope
 if(CMAKE_BUILD_TYPE MATCHES "(Release|Debug)")
   # set strict global compile flags
   add_compile_options(
-    "-fstack-protector-strong"
-    "-ffunction-sections"
     "-fdata-sections"
+    "-ffunction-sections"
+    "-fstack-protector-strong"
+    "-pedantic"
     "-Wall"
     "-Werror"
-    "-Wvla"
-    "-Winit-self"
-    "-Wuninitialized"
     "-Wextra"
-    "-pedantic"
-    "-Wunused-parameter"
-    "-Wshadow"
-    "-Wwrite-strings"
     "-Wformat"
     "-Wformat-security"
-    "-Wstrict-prototypes"
+    "-Winit-self"
+    "-Wmissing-include-dirs"
+    "-Wnested-externs"
     "-Wold-style-definition"
     "-Wredundant-decls"
-    "-Wnested-externs"
-    "-Wmissing-include-dirs"
-    "-Wundef"
+    "-Wshadow"
     "-Wsign-compare"
+    "-Wstrict-prototypes"
+    "-Wundef"
+    "-Wuninitialized"
+    "-Wunused-parameter"
+    "-Wvla"
+    "-Wwrite-strings"
   )
 
   # check for supported compiler flags
@@ -289,14 +289,14 @@ if(MYMPD_ENABLE_LIBASAN)
     "-fsanitize=enum"
     "-fsanitize=float-cast-overflow"
     "-fsanitize=float-divide-by-zero"
+    "-fsanitize=integer-divide-by-zero"
     "-fsanitize=nonnull-attribute"
     "-fsanitize=null"
     "-fsanitize=object-size"
     "-fsanitize=return"
     "-fsanitize=returns-nonnull-attribute"
     "-fsanitize=shift"
     "-fsanitize=signed-integer-overflow"
-    "-fsanitize=integer-divide-by-zero"
     "-fsanitize=undefined"
     "-fsanitize=unreachable"
     "-fsanitize=vla-bound"
@@ -336,7 +336,7 @@ endif()
 if(CMAKE_BUILD_TYPE STREQUAL "Release")
   add_link_options(
     "-pie"
-    "-Wl,-z,relro,-z,now,--gc-sections"
+    "-Wl,-z,relro,-z,now,--gc-sections,--as-needed"
   )
   if(MYMPD_STRIP_BINARY)
     message("Generating stripped binary")

SECURITY.md

@@ -2,10 +2,11 @@
 
 ## Supported Versions
 
-| Version | Supported |
+| VERSION | SUPPORTED |
 | ------- | --------- |
 | Latest Release | :white_check_mark: |
 
 
 ## Reporting a Vulnerability
+
 Please write a mail to: <[email protected]>. I will respond as fast as possible.

build.sh

@@ -62,7 +62,7 @@ cd "$STARTPATH" || exit 1
 umask 0022
 
 #get myMPD version
-VERSION=$(grep CPACK_PACKAGE_VERSION_ CMakeLists.txt | cut -d\" -f2 | tr '\n' '.' | sed 's/\.$//')
+VERSION=$(grep "  VERSION" CMakeLists.txt | sed 's/  VERSION //')
 COPYRIGHT="myMPD ${VERSION} | (c) 2018-2022 Juergen Mang <[email protected]> | SPDX-License-Identifier: GPL-3.0-or-later | https://github.com/jcorporation/mympd"
 
 #check for command
@@ -286,7 +286,7 @@ createassets() {
 }
 
 buildrelease() {
-  echo "Compiling myMPD" 
+  echo "Compiling myMPD v${VERSION}" 
   cmake -B release -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release .
   make -C release
 }
@@ -356,7 +356,7 @@ copyassets() {
 }
 
 builddebug() {
-  echo "Compiling myMPD"
+  echo "Compiling myMPD v${VERSION}"
   if [ "$ACTION" = "memcheck" ]
   then
     MYMPD_ENABLE_LIBASAN=ON
@@ -723,7 +723,7 @@ pkgarch() {
   then
     echo "Checking package with namcap"
     namcap PKGBUILD
-    namcap mympd-*.pkg.tar.xz
+    namcap "mympd-${VERSION}"*.pkg.tar.*
   else
     echo_warn "namcap not found, can't check package"
   fi
@@ -796,7 +796,7 @@ installdeps() {
   elif [ -f /etc/arch-release ]
   then
     #arch
-    pacman -S gcc cmake perl openssl libid3tag flac lua pkgconf pcre2 gzip jq
+    pacman -Sy gcc base-devel cmake perl openssl libid3tag flac lua pkgconf pcre2 gzip jq
   elif [ -f /etc/alpine-release ]
   then
     #alpine
@@ -987,9 +987,9 @@ createi18n() {
   #Update serviceworker
   TO_CACHE=""
   for CODE in $(jq -r "select(.missingPhrases < 100) | keys[]" "$STARTPATH/src/i18n/json/i18n.json" | grep -v "default")
-    do
-      TO_CACHE="${TO_CACHE}\nsubdir + '/assets/i18n/${CODE}.json',"
-    done
+  do
+    TO_CACHE="${TO_CACHE}\nsubdir + '/assets/i18n/${CODE}.json',"
+  done
   sed -e "s|__VERSION__|${VERSION}|g" -e "s|__I18NASSETS__|${TO_CACHE}|g" htdocs/sw.js.in > htdocs/sw.js
 }
 

contrib/initscripts/mympd.openrc.in

@@ -13,6 +13,6 @@ start_stop_daemon_args=""
 pidfile="/run/$name.pid"
 
 depend() {
-	need net
-	after firewall
+    need net
+    after firewall
 }

contrib/man/mympd-script.1

@@ -1,20 +1,35 @@
 .\" Manpage for mympd-script.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "06 Nov 2022" "10.1.0" "mympd-script man page"
+.TH man 1 "13 Nov 2022" "10.1.1" "mympd-script man page"
+
 .SH NAME
-mympd-script \- execute lua scripts through myMPD
+mympd-script
+
 .SH SYNOPSIS
-mympd [/path/to/mympd.conf]
-.SH DESCRIPTION
-myMPD is a standalone and lightweight web-based MPD client.
+mympd-script <uri> <partition> <scriptname> [arguments]
 
-mympd-script is a small commandline tool to submit scripts to myMPD. It reads the script from STDIN and submits it to myMPD for execution. Key=Value parameters can be used to fill the arguments table in the Lua script.
+.SH DESCRIPTION
+mympd-script is a small commandline tool to execute myMPD scripts.
 
 .SH OPTIONS
-Look at https://github.com/jcorporation/myMPD/wiki/Scripting
-.SH BUGS
-Look at https://github.com/jcorporation/myMPD/issues
+.TP
+\fBuri\fR
+myMPD listening uri, e.g. "https://localhost"
+.TP
+\fBpartition\fR
+MPD partition, e.g. "default"
+.TP
+\fBscriptname\fR
+script to execute, use "-" to read the script from stdin.
+.TP
+\fBarguments\fR
+optional space separated key=value pairs to fill the arguments table in the Lua script.
+
 .SH AUTHOR
 Juergen Mang ([email protected])
 
+.SH BUGS
+If you find a bug, please report it at https://github.com/jcorporation/myMPD/issues
+
+.SH SEE ALSO
 https://github.com/jcorporation/myMPD

contrib/man/mympd-script.1.in

@@ -1,20 +1,35 @@
 .\" Manpage for mympd-script.
 .\" Contact <[email protected]> to correct errors or typos.
 .TH man 1 "__DATE_F3__" "__VERSION__" "mympd-script man page"
+
 .SH NAME
-mympd-script \- execute lua scripts through myMPD
+mympd-script
+
 .SH SYNOPSIS
-mympd [/path/to/mympd.conf]
-.SH DESCRIPTION
-myMPD is a standalone and lightweight web-based MPD client.
+mympd-script <uri> <partition> <scriptname> [arguments]
 
-mympd-script is a small commandline tool to submit scripts to myMPD. It reads the script from STDIN and submits it to myMPD for execution. Key=Value parameters can be used to fill the arguments table in the Lua script.
+.SH DESCRIPTION
+mympd-script is a small commandline tool to execute myMPD scripts.
 
 .SH OPTIONS
-Look at https://github.com/jcorporation/myMPD/wiki/Scripting
-.SH BUGS
-Look at https://github.com/jcorporation/myMPD/issues
+.TP
+\fBuri\fR
+myMPD listening uri, e.g. "https://localhost"
+.TP
+\fBpartition\fR
+MPD partition, e.g. "default"
+.TP
+\fBscriptname\fR
+script to execute, use "-" to read the script from stdin.
+.TP
+\fBarguments\fR
+optional space separated key=value pairs to fill the arguments table in the Lua script.
+
 .SH AUTHOR
 Juergen Mang ([email protected])
 
+.SH BUGS
+If you find a bug, please report it at https://github.com/jcorporation/myMPD/issues
+
+.SH SEE ALSO
 https://github.com/jcorporation/myMPD

contrib/man/mympd.1

@@ -1,12 +1,12 @@
 .\" Manpage for mympd.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "06 Nov 2022" "10.1.0" "mympd man page"
+.TH man 1 "13 Nov 2022" "10.1.1" "mympd man page"
 
 .SH NAME
 myMPD \- standalone and mobile friendly web mpd client
 
 .SH SYNOPSIS
-mympd
+mympd [options]
 
 .SH DESCRIPTION
 myMPD is a standalone and lightweight web-based MPD client. It's tuned for minimal resource usage and requires only very few dependencies. Therefore myMPD is ideal for raspberry pis and similar devices.
@@ -49,4 +49,8 @@ sets a pin for myMPD settings
 .SH AUTHOR
 Juergen Mang ([email protected])
 
+.SH BUGS
+If you find a bug, please report it at https://github.com/jcorporation/myMPD/issues
+
+.SH SEE ALSO
 https://github.com/jcorporation/myMPD

contrib/man/mympd.1.in

@@ -6,7 +6,7 @@
 myMPD \- standalone and mobile friendly web mpd client
 
 .SH SYNOPSIS
-mympd
+mympd [options]
 
 .SH DESCRIPTION
 myMPD is a standalone and lightweight web-based MPD client. It's tuned for minimal resource usage and requires only very few dependencies. Therefore myMPD is ideal for raspberry pis and similar devices.
@@ -49,4 +49,8 @@ sets a pin for myMPD settings
 .SH AUTHOR
 Juergen Mang ([email protected])
 
+.SH BUGS
+If you find a bug, please report it at https://github.com/jcorporation/myMPD/issues
+
+.SH SEE ALSO
 https://github.com/jcorporation/myMPD

contrib/packaging/alpine/APKBUILD

@@ -6,7 +6,7 @@
 # Maintainer: Juergen Mang <[email protected]>
 #
 pkgname=mympd
-pkgver=10.1.0
+pkgver=10.1.1
 pkgrel=0
 pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"
@@ -22,10 +22,10 @@ options="!check"
 #no test suite
 
 build() {
-	cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release -DMYMPD_MANPAGES=OFF -DMYMPD_STRIP_BINARY=OFF "$builddir"
-	make -C "$builddir/release"
+    cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release -DMYMPD_MANPAGES=OFF -DMYMPD_STRIP_BINARY=OFF "$builddir"
+    make -C "$builddir/release"
 }
 
 package() {
-	make -C "$builddir/release" DESTDIR="$pkgdir" install
+    make -C "$builddir/release" DESTDIR="$pkgdir" install
 }

contrib/packaging/alpine/APKBUILD.in

@@ -22,10 +22,10 @@ options="!check"
 #no test suite
 
 build() {
-	cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release -DMYMPD_MANPAGES=OFF -DMYMPD_STRIP_BINARY=OFF "$builddir"
-	make -C "$builddir/release"
+    cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release -DMYMPD_MANPAGES=OFF -DMYMPD_STRIP_BINARY=OFF "$builddir"
+    make -C "$builddir/release"
 }
 
 package() {
-	make -C "$builddir/release" DESTDIR="$pkgdir" install
+    make -C "$builddir/release" DESTDIR="$pkgdir" install
 }