Merge branch 'devel'

CHANGELOG.md

@@ -4,6 +4,39 @@ https://github.com/jcorporation/myMPD/
 
 ***
 
+## myMPD v19.0.0 (2024-12-15)
+
+This is a small maintenance release. It ships support for the newest MPD 0.24 protocol commands and enhancements for user defined stickers.
+
+### Scripting
+
+- The deprecated `var_` entries are remove from `mympd_env`, use the subtable `var`.
+
+### API changes
+
+- MYMPD_API_STICKER_NAMES: respect type parameter
+
+### Changelog
+
+- Feat: Support "stickernamestypes" command (MPD 0.24) #1092
+- Feat: Support "tagtypes reset" command (MPD 0.24) #1367
+- Feat: Generate smart playlists by user defined song stickers #1345
+- Feat: Show user defined stickers in lists #1368
+- Feat: New Lua method `mympd.api_partition` #1387
+- Upd: Improve lists layout
+- Upd: libmympdclient 1.0.32
+- Upd: bootstrap.native 5.1 #1372
+- Upd: Improve local playback
+- Upd: Mongoose 7.16 #1375
+- Upd: Improve http client
+- Upd: sds to current master
+- Upd: Remove IntersectionObserver, use image tag with lazy loading
+- Fix: Support "contains" and "starts_with" sticker operators
+- Fix: Increase max header count from 30 to 50
+- Fix: rpm dependency - whiptail is in package newt #1381
+
+***
+
 ## myMPD v18.2.2 (2024-11-21)
 
 This is a small bug fix release.
@@ -80,7 +113,6 @@ This is a small maintenance release.
 - Upd: Translations
 - Upd: Add Lua integer sanity checks
 - Upd: Mongoose to current master
-- Upd: translations
 - Fix: Contextmenu for songs #1356
 
 ***

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_policy(SET CMP0003 NEW)
 # myMPD is written in C
 # supported compilers: gcc, clang
 project(mympd
-  VERSION 18.2.2
+  VERSION 19.0.0
   LANGUAGES C
 )
 
@@ -20,6 +20,7 @@ message("Cmake version: ${CMAKE_VERSION}")
 message("Cmake src dir: ${PROJECT_SOURCE_DIR}")
 message("Cmake build dir: ${CMAKE_CURRENT_BINARY_DIR}")
 message("Cmake build type: ${CMAKE_BUILD_TYPE}")
+message("Cmake generator: ${CMAKE_GENERATOR}")
 message("Compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}")
 message("CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
 message("CMAKE_EXE_LINKER_FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
@@ -262,6 +263,8 @@ endif()
 
 # configure some files - version and path information
 configure_file(src/compile_time.h.in "${PROJECT_BINARY_DIR}/compile_time.h")
+configure_file(src/web_server/embedded_files.c.in "${PROJECT_BINARY_DIR}/embedded_files.c")
+configure_file(src/scripts/lualibs.c.in "${PROJECT_BINARY_DIR}/lualibs.c")
 configure_file(cmake/Install.cmake.in cmake/Install.cmake @ONLY)
 configure_file(contrib/initscripts/mympd.service.system.in contrib/initscripts/system/mympd.service @ONLY)
 configure_file(contrib/initscripts/mympd.service.user.in contrib/initscripts/user/mympd.service @ONLY)
@@ -272,6 +275,7 @@ configure_file(contrib/initscripts/mympd.freebsdrc.in contrib/initscripts/mympd.
 # global compile options
 add_compile_options(
   "-DMPACK_HAS_CONFIG=1"
+  "-DMG_MAX_HTTP_HEADERS=50"
 )
 # set myMPD specific debug define
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")

Doxyfile

@@ -1250,46 +1250,6 @@ USE_HTAGS              = NO
 
 VERBATIM_HEADERS       = YES
 
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see:
-# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
-# performance. This can be particularly helpful with template rich C++ code for
-# which doxygen's built-in parser lacks the necessary type information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
-# tag is set to YES then doxygen will add the directory of each input to the
-# include path.
-# The default value is: YES.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_ADD_INC_PATHS    = YES
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the directory containing a file called compile_commands.json. This
-# file is the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
-# options used when the source files were built. This is equivalent to
-# specifying the -p option to a clang tool, such as clang-check. These options
-# will then be passed to the parser. Any options specified with CLANG_OPTIONS
-# will be added as well.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------

README.md

@@ -60,9 +60,9 @@ The [mympd-scripts](https://github.com/jcorporation/mympd-scripts) repository pr
 
 For information on installation and configuration, see the [myMPD documentation](https://jcorporation.github.io/myMPD/)
 
-- [Installation](https://jcorporation.github.io/myMPD/installation/)
-- [Configuration](https://jcorporation.github.io/myMPD/configuration/)
-- [Running](https://jcorporation.github.io/myMPD/running)
+- [Installation](https://jcorporation.github.io/myMPD/010-installation/)
+- [Configuration](https://jcorporation.github.io/myMPD/020-configuration/)
+- [Running](https://jcorporation.github.io/myMPD/030-running/)
 
 ## Support
 

contrib/lualibs/mympd/10-mympd.lua

@@ -5,13 +5,23 @@ function mympd.init()
   return mympd.api("INTERNAL_API_SCRIPT_INIT")
 end
 
---- Calls the myMPD jsonrpc api
--- @param method
--- @param params
+--- Calls the myMPD jsonrpc api for current partition
+-- @param method myMPD API method
+-- @param params API parameters as lua table
 -- @return 0 for success, else 1
 -- @return jsonrpc result for success, else error
 function mympd.api(method, params)
-  local rc, raw_result = mympd_api(mympd_env.partition, method, json.encode(params))
+  return mympd.api_partition(method, params, mympd_env.partition)
+end
+
+--- Calls the myMPD jsonrpc api
+-- @param partition MPD Partition
+-- @param method myMPD API method
+-- @param params API parameters as lua table
+-- @return 0 for success, else 1
+-- @return jsonrpc result for success, else error
+function mympd.api_partition(partition, method, params)
+  local rc, raw_result = mympd_api(partition, method, json.encode(params))
   local result = json.decode(raw_result)
   if rc == 0 then
     return rc, result["result"]

contrib/man/mympd-config.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd-config.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "21 Nov 2024" "18.2.2" "mympd-config man page"
+.TH man 1 "15 Dec 2024" "19.0.0" "mympd-config man page"
 
 .SH NAME
 mympd-config \- mympd configuration tool

contrib/man/mympd-script.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd-script.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "21 Nov 2024" "18.2.2" "mympd-script man page"
+.TH man 1 "15 Dec 2024" "19.0.0" "mympd-script man page"
 
 .SH NAME
 mympd-script \- mympd command line tool to execute scripts

contrib/man/mympd.1

@@ -1,6 +1,6 @@
 .\" Manpage for mympd.
 .\" Contact <[email protected]> to correct errors or typos.
-.TH man 1 "21 Nov 2024" "18.2.2" "mympd man page"
+.TH man 1 "15 Dec 2024" "19.0.0" "mympd man page"
 
 .SH NAME
 myMPD \- standalone and mobile friendly web mpd client

contrib/packaging/alpine/APKBUILD

@@ -6,14 +6,26 @@
 # Maintainer: Juergen Mang <[email protected]>
 #
 pkgname=mympd
-pkgver=18.2.2
+pkgver=19.0.0
 pkgrel=0
 pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"
 arch="all"
 license="GPL-3.0-or-later"
-depends="libid3tag flac openssl lua5.4 pcre2 newt"
-makedepends="cmake perl gzip jq libid3tag-dev flac-dev openssl-dev linux-headers lua5.4-dev pcre2-dev"
+depends="newt"
+makedepends="
+	cmake
+	flac-dev
+	gzip
+	jq
+	lua5.4
+	lua5.4-dev
+	libid3tag-dev
+	linux-headers
+	openssl-dev
+	pcre2-dev
+	perl
+	"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dbg $pkgname-doc"
 source="mympd_$pkgver.orig.tar.gz"
@@ -22,10 +34,10 @@ options="!check"
 #no test suite
 
 build() {
-    cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo "$builddir"
-    make -C "$builddir/release"
+	cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo "$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

@@ -12,8 +12,20 @@ pkgdesc="myMPD is a standalone and mobile friendly web-based MPD client."
 url="https://jcorporation.github.io/myMPD/"
 arch="all"
 license="GPL-3.0-or-later"
-depends="libid3tag flac openssl lua5.4 pcre2 newt"
-makedepends="cmake perl gzip jq libid3tag-dev flac-dev openssl-dev linux-headers lua5.4-dev pcre2-dev"
+depends="newt"
+makedepends="
+	cmake
+	flac-dev
+	gzip
+	jq
+	lua5.4
+	lua5.4-dev
+	libid3tag-dev
+	linux-headers
+	openssl-dev
+	pcre2-dev
+	perl
+	"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dbg $pkgname-doc"
 source="mympd_$pkgver.orig.tar.gz"
@@ -22,10 +34,10 @@ options="!check"
 #no test suite
 
 build() {
-    cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo "$builddir"
-    make -C "$builddir/release"
+	cmake -B "$builddir/release" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo "$builddir"
+	make -C "$builddir/release"
 }
 
 package() {
-    make -C "$builddir/release" DESTDIR="$pkgdir" install
+	make -C "$builddir/release" DESTDIR="$pkgdir" install
 }

contrib/packaging/arch/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Juergen Mang <[email protected]>
 
 pkgname=mympd
-pkgver=18.2.2
+pkgver=19.0.0
 pkgrel=1
 pkgdesc="A standalone and mobile friendly web-based MPD client."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')

contrib/packaging/debian/changelog

@@ -1,5 +1,5 @@
-mympd (18.2.2-1) unstable; urgency=medium
+mympd (19.0.0-1) unstable; urgency=medium
 
   * Release from master
 
- -- Juergen Mang <[email protected]>  Thu, 21 Nov 2024 18:11:46 +0100
+ -- Juergen Mang <[email protected]>  Sun, 15 Dec 2024 14:12:40 +0100

contrib/packaging/freebsd/multimedia/mympd/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	myMPD
 DISTVERSIONPREFIX= v
-DISTVERSION=	18.2.2
+DISTVERSION=	19.0.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	[email protected]

contrib/packaging/openwrt/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := mympd
-PKG_VERSION := 18.2.2
+PKG_VERSION := 19.0.0
 PKG_RELEASE := 1
 
 PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz

contrib/packaging/rpm/mympd.spec

@@ -4,7 +4,7 @@
 # (c) 2018-2024 Juergen Mang <[email protected]>
 
 Name:           mympd
-Version:        18.2.2
+Version:        19.0.0
 Release:        0
 License:        GPL-3.0-or-later
 Group:          Productivity/Multimedia/Sound/Players
@@ -24,7 +24,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  unzip
 BuildRequires:  gzip
 BuildRequires:  jq
-Requires: whiptail
+Requires: newt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -65,5 +65,5 @@ fi
 %license LICENSE.md
 
 %changelog
-* Thu Nov 21 2024 Juergen Mang <[email protected]> 18.2.2-0
+* Sun Dec 15 2024 Juergen Mang <[email protected]> 19.0.0-0
 - Version from master

contrib/packaging/rpm/mympd.spec.in

@@ -24,7 +24,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  unzip
 BuildRequires:  gzip
 BuildRequires:  jq
-Requires: whiptail
+Requires: newt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description