Merge branch 'develop' for release v3.40.1

Dockerfile-build-alpine

@@ -1,5 +1,5 @@
 FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
-FROM --platform=$BUILDPLATFORM alpine:3.17
+FROM --platform=$BUILDPLATFORM alpine:3.18
 
 ARG BUILD_PACKAGES="\
 	clang \

Dockerfile-release

@@ -1,4 +1,4 @@
-FROM	alpine:3.17 AS build
+FROM	alpine:3.18 AS build
 
 WORKDIR	/tmp/workdir
 
@@ -78,7 +78,7 @@ RUN \
 	make distclean
 
 # WT
-ARG	WT_VERSION=4.9.1
+ARG	WT_VERSION=4.10.0
 RUN \
 	DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \
 	curl -sLO https://github.com/emweb/wt/archive/${WT_VERSION}.tar.gz && \
@@ -133,7 +133,7 @@ RUN \
 	rm -rf /tmp/fakeroot/share/Wt/resources/themes
 
 ## Release Stage
-FROM		alpine:3.17 AS release
+FROM		alpine:3.18 AS release
 LABEL		maintainer="Emeric Poupon <itmfr@yahoo.fr>"
 
 ARG	RUNTIME_PACKAGES=" \
@@ -144,7 +144,7 @@ ARG	RUNTIME_PACKAGES=" \
 	libogg \
 	opus \
 	libvorbis \
-	lame \
+	lame-libs \
 	zlib \
 	boost-filesystem \
 	boost-program_options \

INSTALL.md

@@ -36,7 +36,7 @@ __Notes__:
 * a C++17 compiler is needed
 * ffmpeg version 4 minimum is required
 ```sh
-apt-get install g++ cmake libboost-program-options-dev libboost-system-dev libavutil-dev libavformat-dev libstb-dev libconfig++-dev ffmpeg libtag1-dev libpam0g-dev libgtest-dev
+apt-get install g++ cmake libboost-program-options-dev libboost-system-dev libavutil-dev libavformat-dev libstb-dev libconfig++-dev ffmpeg libtag1-dev libpam0g-dev libgtest-dev libarchive-dev
 ```
 __Notes__:
 * libpam0g-dev is optional (only for using PAM authentication)

src/lms/ui/MediaPlayer.cpp

@@ -311,7 +311,7 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain)
 	}
 
 	LMS_LOG(UI, DEBUG) << "Running js = '" << oss.str() << "'";
-	wApp->doJavaScript(oss.str());
+	doJavaScript(oss.str());
 
 	_trackIdLoaded = trackId;
 	trackLoaded.emit(*_trackIdLoaded);
@@ -320,7 +320,7 @@ MediaPlayer::loadTrack(Database::TrackId trackId, bool play, float replayGain)
 void
 MediaPlayer::stop()
 {
-	wApp->doJavaScript("LMS.mediaplayer.stop()");
+	doJavaScript("LMS.mediaplayer.stop()");
 }
 
 void

src/lms/ui/explore/ArtistView.cpp

@@ -76,6 +76,7 @@ Artist::Artist(Filters& filters, PlayQueueController& controller)
 
 	filters.updated().connect([this]
 	{
+		_needForceRefresh = true;
 		refreshView();
 	});
 
@@ -111,12 +112,13 @@ Artist::refreshView()
 	const auto artistId {extractArtistIdFromInternalPath()};
 
 	// consider everything is up to date is the same artist is being rendered
-	if (artistId && *artistId == _artistId)
+	if (!_needForceRefresh && artistId && *artistId == _artistId)
 		return;
 
 	clear();
 	_artistId = {};
 	_trackContainer = nullptr;
+	_needForceRefresh = false;
 
 	if (!artistId)
 		throw ArtistNotFoundException {};

src/lms/ui/explore/ArtistView.hpp

@@ -80,6 +80,7 @@ namespace UserInterface
 			ReleaseContainer			_appearsOnReleaseContainer {};
 			InfiniteScrollingContainer* _trackContainer {};
 			Database::ArtistId			_artistId {};
+			bool						_needForceRefresh {};
 	};
 } // namespace UserInterface
 

src/lms/ui/explore/ReleaseView.cpp

@@ -184,6 +184,7 @@ Release::Release(Filters& filters, PlayQueueController& playQueueController)
 
 	_filters.updated().connect([this]
 	{
+		_needForceRefresh = true;
 		refreshView();
 	});
 
@@ -220,11 +221,12 @@ Release::refreshView()
 	const auto releaseId {extractReleaseIdFromInternalPath()};
 
 	// consider everything is up to date is the same release is being rendered
-	if (releaseId && *releaseId == _releaseId)
+	if (!_needForceRefresh && releaseId && *releaseId == _releaseId)
 		return;
 
 	clear();
 	_releaseId = {};
+	_needForceRefresh = false;
 
 	if (!releaseId)
 		throw ReleaseNotFoundException {};

src/lms/ui/explore/ReleaseView.hpp

@@ -48,6 +48,7 @@ namespace UserInterface
 			Filters&				_filters;
 			PlayQueueController&	_playQueueController;
 			Database::ReleaseId		_releaseId;
+			bool					_needForceRefresh {};
 	};
 } // namespace UserInterface