Merge branch 'develop' for release v3.39.0

Dockerfile-release

@@ -72,7 +72,7 @@ RUN \
 	--enable-protocol=file,pipe \
 	--enable-filter=aresample \
 	--extra-libs=-ldl && \
-	make && \
+	make -j$(nproc) && \
 	make install && \
 	make distclean
 
@@ -86,7 +86,7 @@ RUN \
 RUN \
 	DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \
 	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DBUILD_EXAMPLES=OFF -DENABLE_LIBWTTEST=OFF -DCONNECTOR_FCGI=OFF && \
-	make && \
+	make -j$(nproc) && \
 	make install
 
 # STB
@@ -103,7 +103,7 @@ COPY . /tmp/lms/
 RUN \
 	DIR=/tmp/lms/build && mkdir -p ${DIR} && cd ${DIR} && \
 	PKG_CONFIG_PATH=/tmp/install/lib/pkgconfig CXXFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib -Wl,--rpath-link=${PREFIX}/lib" cmake /tmp/lms/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_PREFIX_PATH=${PREFIX} && \
-	LD_LIBRARY_PATH=${PREFIX}/lib VERBOSE=1 make && \
+	LD_LIBRARY_PATH=${PREFIX}/lib VERBOSE=1 make -j$(nproc) && \
 	LD_LIBRARY_PATH=${PREFIX}/lib make test && \
 	make install && \
 	mkdir -p ${PREFIX}/etc/ && \

approot/artist.xml

@@ -10,8 +10,9 @@
 			${play-btn class="btn btn-primary"}
 			<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"/>
 			<ul class="dropdown-menu">
-				<li>${play-shuffled class="dropdown-item"}</li>
+				<li>${play-next class="dropdown-item"}</li>
 				<li>${play-last class="dropdown-item"}</li>
+				<li>${play-shuffled class="dropdown-item"}</li>
 				<li>${star class="dropdown-item"}</li>
 				${<if-has-mbid>}
 				<li><a href="${mbid-link}" target="_blank" class="dropdown-item">${tr:Lms.Explore.musicbrainz-artist}</a></li>

approot/messages.xml

@@ -132,6 +132,7 @@
 <message id="Lms.Explore.musicbrainz-release">MusicBrainz Release</message>
 <message id="Lms.Explore.play">Play</message>
 <message id="Lms.Explore.play-last">Play last</message>
+<message id="Lms.Explore.play-next">Play next</message>
 <message id="Lms.Explore.play-shuffled">Play shuffled</message>
 <message id="Lms.Explore.random">Random</message>
 <message id="Lms.Explore.recently-added">Recently added</message>

approot/messages_fr.xml

@@ -132,6 +132,7 @@
 <message id="Lms.Explore.musicbrainz-release">MusicBrainz Release</message>
 <message id="Lms.Explore.play">Jouer</message>
 <message id="Lms.Explore.play-last">Jouer en dernier</message>
+<message id="Lms.Explore.play-next">Jouer ensuite</message>
 <message id="Lms.Explore.play-shuffled">Jouer aléatoirement</message>
 <message id="Lms.Explore.random">Aléatoire</message>
 <message id="Lms.Explore.recently-added">Ajoutés récemment</message>

approot/messages_it.xml

@@ -132,6 +132,7 @@
 <message id="Lms.Explore.musicbrainz-release">Album MusicBrainz</message>
 
 <message id="Lms.Explore.play-last">Aggiungi alla coda di riproduzione</message>
+
 <message id="Lms.Explore.play-shuffled">Aggiungi alla coda di riproduzione mischiando</message>
 <message id="Lms.Explore.random">Casuali</message>
 <message id="Lms.Explore.recently-added">Aggiunti di recente</message>

approot/messages_zh.xml

@@ -132,6 +132,7 @@
 <message id="Lms.Explore.musicbrainz-release">MusicBrainz 专辑</message>
 <message id="Lms.Explore.play">播放</message>
 <message id="Lms.Explore.play-last">最后播放</message>
+
 <message id="Lms.Explore.play-shuffled">随机播放</message>
 <message id="Lms.Explore.random">随机</message>
 <message id="Lms.Explore.recently-added">最近添加</message>

approot/release.xml

@@ -21,8 +21,9 @@
 				${play-btn class="btn btn-primary"}
 				<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"/>
 				<ul class="dropdown-menu">
-					<li>${play-shuffled class="dropdown-item"}</li>
+					<li>${play-next class="dropdown-item"}</li>
 					<li>${play-last class="dropdown-item"}</li>
+					<li>${play-shuffled class="dropdown-item"}</li>
 					<li>${star class="dropdown-item"}</li>
 					${<if-has-mbid>}
 					<li><a href="${mbid-link}" target="_blank" class="dropdown-item">${tr:Lms.Explore.musicbrainz-release}</a></li>
@@ -82,7 +83,8 @@
 			<div class="dropdown d-inline-block">
 				${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
 				<ul class="dropdown-menu" aria-labelledby="${id:more-btn}">
-					<li>${play class="dropdown-item"}</li>
+					<li class="d-block d-sm-none">${play class="dropdown-item"}</li>
+					<li>${play-next class="dropdown-item"}</li>
 					<li>${play-last class="dropdown-item"}</li>
 					<li>${star class="dropdown-item"}</li>
 					<li>${download class="dropdown-item"}</li>

approot/releases.xml

@@ -28,6 +28,7 @@
 			${play-btn class="btn btn-primary"}
 			<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"/>
 			<ul class="dropdown-menu">
+				<li>${play-next class="dropdown-item"}</li>
 				<li>${play-last class="dropdown-item"}</li>
 				<li>${play-shuffled class="dropdown-item"}</li>
 			</ul>

approot/tracks.xml

@@ -29,6 +29,7 @@
 			${play-btn class="btn btn-primary"}
 			<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false"/>
 			<ul class="dropdown-menu">
+				<li>${play-next class="dropdown-item"}</li>
 				<li>${play-last class="dropdown-item"}</li>
 				<li>${play-shuffled class="dropdown-item"}</li>
 			</ul>
@@ -69,7 +70,8 @@
 			<div class="dropdown d-inline-block">
 				${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"}
 				<ul class="dropdown-menu" aria-labelledby="${id:more-btn}">
-					<li>${play class="dropdown-item"}</li>
+					<li class="d-block d-sm-none">${play class="dropdown-item"}</li>
+					<li>${play-next class="dropdown-item"}</li>
 					<li>${play-last class="dropdown-item"}</li>
 					<li>${star class="dropdown-item"}</li>
 					<li>${download class="dropdown-item"}</li>

src/libs/services/database/impl/TrackList.cpp

@@ -149,7 +149,7 @@ TrackList::getEntry(std::size_t pos) const
 {
 	TrackListEntry::pointer res;
 
-	auto entries = getEntries(pos, 1);
+	auto entries = getEntries(Range {pos, 1});
 	if (!entries.empty())
 		res = entries.front();
 
@@ -157,7 +157,7 @@ TrackList::getEntry(std::size_t pos) const
 }
 
 std::vector<TrackListEntry::pointer>
-TrackList::getEntries(std::optional<std::size_t> offset, std::optional<std::size_t> size) const
+TrackList::getEntries(std::optional<Range> range) const
 {
 	assert(session());
 
@@ -165,8 +165,8 @@ TrackList::getEntries(std::optional<std::size_t> offset, std::optional<std::size
 		session()->find<TrackListEntry>()
 		.where("tracklist_id = ?").bind(getId())
 		.orderBy("id")
-		.limit(size ? static_cast<int>(*size) : -1)
+		.limit(range ? static_cast<int>(range->size) + 1 : -1)
-		.offset(offset ? static_cast<int>(*offset) : -1)
+		.offset(range ? static_cast<int>(range->offset) : -1)
 		.resultList()};
 
 	return std::vector<TrackListEntry::pointer>(entries.begin(), entries.end());
@@ -671,7 +671,7 @@ TrackListEntry::TrackListEntry(ObjectPtr<Track> track, ObjectPtr<TrackList> trac
 TrackListEntry::pointer
 TrackListEntry::create(Session& session, ObjectPtr<Track> track, ObjectPtr<TrackList> tracklist, const Wt::WDateTime& dateTime)
 {
-	return session.getDboSession().add(std::unique_ptr<TrackListEntry>( new TrackListEntry {track, tracklist, dateTime}));
+	return session.getDboSession().add(std::unique_ptr<TrackListEntry> {new TrackListEntry {track, tracklist, dateTime}});
 }
 
 void

src/libs/services/database/include/services/database/Artist.hpp

@@ -49,7 +49,7 @@ class Track;
 class TrackArtistLink;
 class User;
 
-class Artist : public Object<Artist, ArtistId>
+class Artist final : public Object<Artist, ArtistId>
 {
 	public:
 		struct FindParameters

src/libs/services/database/include/services/database/AuthToken.hpp

@@ -32,7 +32,7 @@ namespace Database
 	class Session;
 
 	class User;
-	class AuthToken : public Object<AuthToken, AuthTokenId>
+	class AuthToken final : public Object<AuthToken, AuthTokenId>
 	{
 		public:
 			AuthToken() = default;

src/libs/services/database/include/services/database/Cluster.hpp

@@ -38,7 +38,7 @@ class ClusterType;
 class ScanSettings;
 class Session;
 
-class Cluster : public Object<Cluster, ClusterId>
+class Cluster final : public Object<Cluster, ClusterId>
 {
 	public:
 		Cluster() = default;
@@ -81,7 +81,7 @@ class Cluster : public Object<Cluster, ClusterId>
 };
 
 
-class ClusterType : public Object<ClusterType, ClusterTypeId>
+class ClusterType final : public Object<ClusterType, ClusterTypeId>
 {
 	public:
 		ClusterType() = default;

src/libs/services/database/include/services/database/Listen.hpp

@@ -38,7 +38,7 @@ class Session;
 class Track;
 class User;
 
-class Listen : public Object<Listen, ListenId>
+class Listen final : public Object<Listen, ListenId>
 {
 	public:
 		Listen() = default;

src/libs/services/database/include/services/database/Release.hpp

@@ -45,7 +45,7 @@ class Session;
 class Track;
 class User;
 
-class Release : public Object<Release, ReleaseId>
+class Release final : public Object<Release, ReleaseId>
 {
 	public:
 		struct FindParameters

src/libs/services/database/include/services/database/ScanSettings.hpp

@@ -35,7 +35,7 @@ namespace Database {
 class ClusterType;
 class Session;
 
-class ScanSettings : public Object<ScanSettings, ScanSettingsId>
+class ScanSettings final : public Object<ScanSettings, ScanSettingsId>
 {
 	public:
 		// Do not modify values (just add)

src/libs/services/database/include/services/database/StarredArtist.hpp

@@ -34,7 +34,7 @@ namespace Database
 	class Session;
 	class User;
 
-	class StarredArtist : public Object<StarredArtist, StarredArtistId>
+	class StarredArtist final : public Object<StarredArtist, StarredArtistId>
 	{
 		public:
 			StarredArtist() = default;

src/libs/services/database/include/services/database/StarredRelease.hpp

@@ -34,7 +34,7 @@ namespace Database
 	class Session;
 	class User;
 
-	class StarredRelease : public Object<StarredRelease, StarredReleaseId>
+	class StarredRelease final : public Object<StarredRelease, StarredReleaseId>
 	{
 		public:
 			StarredRelease() = default;

src/libs/services/database/include/services/database/StarredTrack.hpp

@@ -35,7 +35,7 @@ namespace Database
 	class Session;
 	class User;
 
-	class StarredTrack : public Object<StarredTrack, StarredTrackId>
+	class StarredTrack final : public Object<StarredTrack, StarredTrackId>
 	{
 		public:
 			StarredTrack() = default;

src/libs/services/database/include/services/database/Track.hpp

@@ -56,7 +56,7 @@ class TrackArtistLink;
 class TrackStats;
 class User;
 
-class Track : public Object<Track, TrackId>
+class Track final : public Object<Track, TrackId>
 {
 	public:
 		struct FindParameters

src/libs/services/database/include/services/database/TrackArtistLink.hpp

@@ -35,12 +35,11 @@ LMS_DECLARE_IDTYPE(TrackArtistLinkId)
 
 namespace Database
 {
-
 	class Artist;
 	class Session;
 	class Track;
 
-	class TrackArtistLink : public Object<TrackArtistLink, TrackArtistLinkId>
+	class TrackArtistLink final : public Object<TrackArtistLink, TrackArtistLinkId>
 	{
 		public:
 			struct FindParameters

src/libs/services/database/include/services/database/TrackBookmark.hpp

@@ -37,7 +37,7 @@ class Session;
 class Track;
 class User;
 
-class TrackBookmark : public Object<TrackBookmark, TrackBookmarkId>
+class TrackBookmark final : public Object<TrackBookmark, TrackBookmarkId>
 {
 	public:
 		TrackBookmark () = default;

src/libs/services/database/include/services/database/TrackFeatures.hpp

@@ -42,7 +42,7 @@ using FeatureName = std::string;
 using FeatureValues  = std::vector<double>;
 using FeatureValuesMap = std::unordered_map<FeatureName, FeatureValues>;
 
-class TrackFeatures : public Object<TrackFeatures, TrackFeaturesId>
+class TrackFeatures final : public Object<TrackFeatures, TrackFeaturesId>
 {
 	public:
 		TrackFeatures() = default;

src/libs/services/database/include/services/database/TrackList.hpp

@@ -45,7 +45,7 @@ class Track;
 class TrackListEntry;
 class User;
 
-class TrackList : public Object<TrackList, TrackListId>
+class TrackList final : public Object<TrackList, TrackListId>
 {
 	public:
 		TrackList() = default;
@@ -90,7 +90,7 @@ class TrackList : public Object<TrackList, TrackListId>
 		bool										isEmpty() const;
 		std::size_t									getCount() const;
 		ObjectPtr<TrackListEntry>					getEntry(std::size_t pos) const;
-		std::vector<ObjectPtr<TrackListEntry>>		getEntries(std::optional<std::size_t> offset = {}, std::optional<std::size_t> size = {}) const;
+		std::vector<ObjectPtr<TrackListEntry>>		getEntries(std::optional<Range> range = {}) const;
 		ObjectPtr<TrackListEntry>					getEntryByTrackAndDateTime(ObjectPtr<Track> track, const Wt::WDateTime& dateTime) const;
 
 		std::vector<ObjectPtr<Artist>>				getArtists(const std::vector<ClusterId>& clusters, std::optional<TrackArtistLinkType> linkType, ArtistSortMethod sortMethod, std::optional<Range> range, bool& moreResults) const;
@@ -144,7 +144,7 @@ class TrackList : public Object<TrackList, TrackListId>
 		Wt::Dbo::collection<Wt::Dbo::ptr<TrackListEntry>> _entries;
 };
 
-class TrackListEntry : public Object<TrackListEntry, TrackListEntryId>
+class TrackListEntry final : public Object<TrackListEntry, TrackListEntryId>
 {
 	public:
 		TrackListEntry() = default;

src/libs/services/database/include/services/database/User.hpp

@@ -36,7 +36,7 @@ namespace Database {
 class AuthToken;
 class Session;
 
-class User : public Object<User, UserId>
+class User final : public Object<User, UserId>
 {
 	public:
 		struct PasswordHash

src/libs/services/database/test/TrackList.cpp

@@ -479,3 +479,43 @@ TEST_F(DatabaseFixture, SingleTrackListSingleTrackWithCluster)
 		EXPECT_EQ(trackLists.results.front(), trackList1.getId());
 	}
 }
+
+TEST_F(DatabaseFixture, SingleTrackList_getEntries)
+{
+	ScopedUser user {session, "MyUser"};
+	ScopedTrackList trackList {session, "MyTrackList", TrackListType::Playlist, false, user.lockAndGet()};
+	ScopedTrack track1 {session, "MyTrack"};
+	ScopedTrack track2 {session, "MyTrack"};
+
+	{
+		auto transaction {session.createUniqueTransaction()};
+		session.create<TrackListEntry>(track1.get(), trackList.get());
+	}
+
+	{
+		auto transaction {session.createSharedTransaction()};
+		auto entries {trackList.get()->getEntries()};
+		ASSERT_EQ(entries.size(), 1);
+		EXPECT_EQ(entries.front()->getTrack()->getId(), track1.getId());
+	}
+
+	{
+		auto transaction {session.createUniqueTransaction()};
+		session.create<TrackListEntry>(track2.get(), trackList.get());
+	}
+
+	{
+		auto transaction {session.createSharedTransaction()};
+		auto entries {trackList.get()->getEntries()};
+		ASSERT_EQ(entries.size(), 2);
+		EXPECT_EQ(entries[0]->getTrack()->getId(), track1.getId());
+		EXPECT_EQ(entries[1]->getTrack()->getId(), track2.getId());
+	}
+
+	{
+		auto transaction {session.createSharedTransaction()};
+		auto entries {trackList.get()->getEntries(Range {1, 1})};
+		ASSERT_EQ(entries.size(), 1);
+		EXPECT_EQ(entries[0]->getTrack()->getId(), track2.getId());
+	}
+}

src/libs/services/recommendation/include/services/recommendation/IPlaylistGeneratorService.hpp

@@ -35,6 +35,8 @@ namespace Recommendation
 	class IPlaylistGeneratorService
 	{
 		public:
+			virtual ~IPlaylistGeneratorService() = default;
+
 			// extend an existing playlist with similar tracks (but use playlist contraints)
 			virtual TrackContainer extendPlaylist(Database::TrackListId tracklistId, std::size_t maxCount) const = 0;
 	};

src/lms/ui/LmsApplication.cpp

@@ -506,7 +506,7 @@ R"(function(current) {
 
 	_mediaPlayer->playbackEnded.connect([this]
 	{
-		_playQueue->playNext();
+		_playQueue->onPlaybackEnded();
 	});
 
 	_playQueue->trackSelected.connect([this] (Database::TrackId trackId, bool play, float replayGain)

src/lms/ui/ModalManager.cpp

@@ -60,7 +60,7 @@ namespace UserInterface
 
 		doJavaScript(oss.str());
 
-		addWidget(move(modalWidget));
+		addWidget(std::move(modalWidget));
 	}
 
 	void

src/lms/ui/PlayQueue.cpp

@@ -158,7 +158,7 @@ PlayQueue::PlayQueue()
 			for (const Database::TrackListEntry::pointer& entry : entries)
 				LmsApp->getDbSession().create<Database::TrackListEntry>(entry->getTrack(), queue);
 		}
-		_entriesContainer->clear();
+		_entriesContainer->reset();
 		addSome();
 	});
 
@@ -233,7 +233,6 @@ PlayQueue::PlayQueue()
 	});
 
 	updateInfo();
-	addSome();
 }
 
 bool
@@ -269,7 +268,8 @@ PlayQueue::clearTracks()
 		getQueue().modify()->clear();
 	}
 
-	_entriesContainer->clear();
+	_entriesContainer->reset();
+	_trackPos.reset();
 	updateInfo();
 }
 
@@ -278,6 +278,7 @@ PlayQueue::stop()
 {
 	updateCurrentTrack(false);
 	_trackPos.reset();
+	_isTrackSelected = false;
 	trackUnselected.emit();
 }
 
@@ -318,6 +319,7 @@ PlayQueue::loadTrack(std::size_t pos, bool play)
 
 	enqueueRadioTracksIfNeeded();
 	updateCurrentTrack(true);
+	_isTrackSelected = true;
 	trackSelected.emit(trackId, play, replayGain ? *replayGain : 0);
 }
 
@@ -345,6 +347,12 @@ PlayQueue::playNext()
 	loadTrack(*_trackPos + 1, true);
 }
 
+void
+PlayQueue::onPlaybackEnded()
+{
+	playNext();
+}
+
 std::size_t
 PlayQueue::getCount()
 {
@@ -401,11 +409,9 @@ PlayQueue::updateCurrentTrack(bool selected)
 	entry->toggleStyleClass("Lms-entry-playing", selected);
 }
 
-std::size_t
+void
 PlayQueue::enqueueTracks(const std::vector<Database::TrackId>& trackIds)
 {
-	std::size_t nbTracksQueued {};
-
 	{
 		auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
 
@@ -415,22 +421,51 @@ PlayQueue::enqueueTracks(const std::vector<Database::TrackId>& trackIds)
 		std::size_t nbTracksToEnqueue {queueSize + trackIds.size() > getCapacity() ? getCapacity() - queueSize : trackIds.size()};
 		for (const Database::TrackId trackId : trackIds)
 		{
+			if (nbTracksToEnqueue == 0)
+				break;
+
 			Database::Track::pointer track {Database::Track::find(LmsApp->getDbSession(), trackId)};
 			if (!track)
 				continue;
 
-			if (nbTracksQueued == nbTracksToEnqueue)
-				break;
-
 			LmsApp->getDbSession().create<Database::TrackListEntry>(track, queue);
-			nbTracksQueued++;
+			nbTracksToEnqueue--;
 		}
 	}
 
 	updateInfo();
 	addSome();
+	_entriesContainer->setHasMore();
+}
 
-	return nbTracksQueued;
+std::vector<Database::TrackId>
+PlayQueue::getAndClearNextTracks()
+{
+	std::vector<Database::TrackId> tracks;
+
+	auto transaction {LmsApp->getDbSession().createUniqueTransaction()};
+
+	Database::TrackList::pointer queue {getQueue()};
+	std::vector<Database::TrackListEntry::pointer> entries {queue->getEntries(Database::Range {_trackPos ? *_trackPos + 1 : 0, getCapacity()})};
+	tracks.reserve(entries.size());
+	for (Database::TrackListEntry::pointer entry : entries)
+	{
+		tracks.push_back(entry->getTrack()->getId());
+		entry.remove();
+	}
+
+	if (_trackPos)
+	{
+		// entries may have been cleared
+		if (*_trackPos + 1 < _entriesContainer->getCount())
+			_entriesContainer->remove(*_trackPos + 1, _entriesContainer->getCount() - 1);
+	}
+	else
+	{
+		_entriesContainer->reset();
+	}
+
+	return tracks;
 }
 
 void
@@ -439,6 +474,14 @@ PlayQueue::play(const std::vector<Database::TrackId>& trackIds)
 	playAtIndex(trackIds, 0);
 }
 
+void
+PlayQueue::playNext(const std::vector<Database::TrackId>& trackIds)
+{
+	std::vector<Database::TrackId> nextTracks {getAndClearNextTracks()};
+	nextTracks.insert(std::cbegin(nextTracks), std::cbegin(trackIds), std::cend(trackIds));
+	playOrAddLast(nextTracks);
+}
+
 void
 PlayQueue::playShuffled(const std::vector<Database::TrackId>& trackIds)
 {
@@ -453,7 +496,7 @@ void
 PlayQueue::playOrAddLast(const std::vector<Database::TrackId>& trackIds)
 {
 	enqueueTracks(trackIds);
-	if (!_trackPos)
+	if (!_isTrackSelected)
 		loadTrack(0, true);
 }
 
@@ -471,11 +514,9 @@ PlayQueue::addSome()
 	auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
 	const Database::TrackList::pointer queue {getQueue()};
-	const auto tracklistEntries {queue->getEntries(_entriesContainer->getCount(), _batchSize)};
+	const auto tracklistEntries {queue->getEntries(Database::Range {_entriesContainer->getCount(), _batchSize})};
 	for (const Database::TrackListEntry::pointer& tracklistEntry : tracklistEntries)
 		addEntry(tracklistEntry);
-
-	_entriesContainer->setHasMore(_entriesContainer->getCount() < queue->getCount());
 }
 
 void
@@ -491,7 +532,6 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry)
 	entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain);
 
 	const auto artists {track->getArtistIds({Database::TrackArtistLinkType::Artist})};
-	LMS_LOG(UI, DEBUG) << "Found " << artists.size() << " artists!";
 	if (!artists.empty())
 	{
 		entry->setCondition("if-has-artists", true);
@@ -544,6 +584,8 @@ PlayQueue::addEntry(const Database::TrackListEntry::pointer& tracklistEntry)
 			const std::optional<std::size_t> pos {_entriesContainer->getIndexOf(*entry)};
 			if (pos && *_trackPos >= *pos)
 				(*_trackPos)--;
+			else if (*_trackPos >= _entriesContainer->getCount())
+				_trackPos.reset();
 		}
 
 		_entriesContainer->remove(*entry);

src/lms/ui/PlayQueue.hpp

@@ -50,6 +50,7 @@ class PlayQueue : public Template
 		PlayQueue();
 
 		void play(const std::vector<Database::TrackId>& trackIds);
+		void playNext(const std::vector<Database::TrackId>& trackIds);
 		void playShuffled(const std::vector<Database::TrackId>& trackIds);
 		void playOrAddLast(const std::vector<Database::TrackId>& trackIds); // play if queue empty, otherwise just add last
 		void playAtIndex(const std::vector<Database::TrackId>& trackIds, std::size_t index);
@@ -69,6 +70,8 @@ class PlayQueue : public Template
 		// Signal emitted when track count changed
 		Wt::Signal<std::size_t> trackCountChanged;
 
+		void onPlaybackEnded();
+
 		std::size_t getCapacity() const { return _capacity; }
 		std::size_t getCount();
 
@@ -80,7 +83,8 @@ class PlayQueue : public Template
 		bool isFull() const;
 
 		void clearTracks();
-		std::size_t enqueueTracks(const std::vector<Database::TrackId>& trackIds);
+		void enqueueTracks(const std::vector<Database::TrackId>& trackIds);
+		std::vector<Database::TrackId> getAndClearNextTracks();
 		void addSome();
 		void addEntry(const Database::ObjectPtr<Database::TrackListEntry>& entry);
 		void enqueueRadioTracksIfNeeded();
@@ -110,6 +114,7 @@ class PlayQueue : public Template
 		Wt::WCheckBox* _repeatBtn {};
 		Wt::WCheckBox* _radioBtn {};
 		std::optional<std::size_t> _trackPos;	// current track position, if set
+		bool _isTrackSelected {};
 };
 
 } // namespace UserInterface

src/lms/ui/admin/DatabaseSettingsView.cpp

@@ -44,7 +44,6 @@ namespace UserInterface {
 
 using namespace Database;
 
-
 class DatabaseSettingsModel : public Wt::WFormModel
 {
 	public:
@@ -69,7 +68,7 @@ class DatabaseSettingsModel : public Wt::WFormModel
 
 			auto dirValidator {createDirectoryValidator()};
 			dirValidator->setMandatory(true);
-			setValidator(MediaDirectoryField, move(dirValidator));
+			setValidator(MediaDirectoryField, std::move(dirValidator));
 
 			setValidator(UpdatePeriodField, createMandatoryValidator());
 			setValidator(UpdateStartTimeField, createMandatoryValidator());

src/lms/ui/common/InfiniteScrollingContainer.cpp

@@ -19,6 +19,7 @@
 
 #include "InfiniteScrollingContainer.hpp"
 
+#include <cassert>
 #include "LoadingIndicator.hpp"
 
 namespace UserInterface
@@ -28,14 +29,20 @@ namespace UserInterface
 		, _elements {bindNew<Wt::WContainerWidget>("elements")}
 		, _loadingIndicator {bindWidget<Wt::WTemplate>("loading-indicator", createLoadingIndicator())}
 	{
-		hideLoadingIndicator();
+		reset();
 	}
 
 	void
 	InfiniteScrollingContainer::clear()
+	{
+		assert(false);
+	}
+
+	void
+	InfiniteScrollingContainer::reset()
 	{
 		_elements->clear();
-		hideLoadingIndicator();
+		setHasMore(true);
 	}
 
 	std::size_t
@@ -50,6 +57,12 @@ namespace UserInterface
 		return _elements->addWidget(std::move(result));
 	}
 
+	void
+	InfiniteScrollingContainer::setHasMore()
+	{
+		setHasMore(true);
+	}
+
 	void
 	InfiniteScrollingContainer::setHasMore(bool hasMore)
 	{
@@ -65,6 +78,22 @@ namespace UserInterface
 		_elements->removeWidget(&widget);
 	}
 
+	void
+	InfiniteScrollingContainer::remove(std::size_t first, std::size_t last)
+	{
+		assert(last >= first);
+		assert(last < static_cast<std::size_t>(_elements->count()));
+
+		// remove from end as API is quite uneffective (minimize moves)
+		std::size_t i {last};
+		while (Wt::WWidget* widget {_elements->widget(i)})
+		{
+			_elements->removeWidget(widget);
+			if (i-- == first)
+				break;
+		}
+	}
+
 	Wt::WWidget*
 	InfiniteScrollingContainer::getWidget(std::size_t pos) const
 	{
@@ -87,7 +116,9 @@ namespace UserInterface
 			if (!visible)
 				return;
 
+			const auto previousCount {_elements->count()};
 			onRequestElements.emit();
+			setHasMore(previousCount != _elements->count());
 		});
 	}
 

src/lms/ui/common/InfiniteScrollingContainer.hpp

@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <memory>
 #include <optional>
 #include <utility>
 
@@ -29,13 +30,15 @@
 
 namespace UserInterface
 {
-	class InfiniteScrollingContainer : public Wt::WTemplate
+	// Atomatically raises onRequestElements signal when the sentinel is displayed
+	// can add elements afterwards by calling setHasMoreElements()
+	class InfiniteScrollingContainer final : public Wt::WTemplate
 	{
 		public:
 			// "text" must contain loading-indicator and "elements"
 			InfiniteScrollingContainer(const Wt::WString& text = Wt::WString::tr("Lms.infinite-scrolling-container.template"));
 
-			void clear();
+			void reset();
 			std::size_t getCount();
 			void add(std::unique_ptr<Wt::WWidget> result);
 
@@ -46,17 +49,19 @@ namespace UserInterface
 			}
 
 			void remove(Wt::WWidget& widget);
+			void remove(std::size_t first, std::size_t last);
 
 			Wt::WWidget*				getWidget(std::size_t pos) const;
 			std::optional<std::size_t>	getIndexOf(Wt::WWidget& widget) const;
-
+			void 						setHasMore(); // can be used to add elements afterwards
-			void setHasMore(bool hasMore);
 
 			Wt::Signal<>	onRequestElements;
 
 		private:
+			void clear() override;
 			void displayLoadingIndicator();
 			void hideLoadingIndicator();
+			void setHasMore(bool hasMore); // can be used to add elements afterwards
 
 			Wt::WContainerWidget*	_elements;
 			Wt::WTemplate*			_loadingIndicator;

src/lms/ui/explore/ArtistView.cpp

@@ -108,11 +108,16 @@ Artist::refreshView()
 	if (!wApp->internalPathMatches("/artist/"))
 		return;
 
+	const auto artistId {extractArtistIdFromInternalPath()};
+
+	// consider everything is up to date is the same artist is being rendered
+	if (artistId && *artistId == _artistId)
+		return;
+
 	clear();
 	_artistId = {};
 	_trackContainer = nullptr;
 
-	const auto artistId {extractArtistIdFromInternalPath()};
 	if (!artistId)
 		throw ArtistNotFoundException {};
 
@@ -166,28 +171,33 @@ Artist::refreshView()
 		{
 			_playQueueController.processCommand(PlayQueueController::Command::PlayShuffled, {_artistId});
 		});
+	bindNew<Wt::WPushButton>("play-next", Wt::WString::tr("Lms.Explore.play-next"), Wt::TextFormat::Plain)
+		->clicked().connect([=]
+		{
+			_playQueueController.processCommand(PlayQueueController::Command::PlayNext, {_artistId});
+		});
 	bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"), Wt::TextFormat::Plain)
 		->clicked().connect([=]
 		{
 			_playQueueController.processCommand(PlayQueueController::Command::PlayOrAddLast, {_artistId});
 		});
 	bindNew<Wt::WPushButton>("download", Wt::WString::tr("Lms.Explore.download"))
-		->setLink(Wt::WLink {std::make_unique<DownloadArtistResource>(*artistId)});
+		->setLink(Wt::WLink {std::make_unique<DownloadArtistResource>(_artistId)});
 
 	{
-		auto isStarred {[=] { return Service<Scrobbling::IScrobblingService>::get()->isStarred(LmsApp->getUserId(), *artistId); }};
+		auto isStarred {[=] { return Service<Scrobbling::IScrobblingService>::get()->isStarred(LmsApp->getUserId(), _artistId); }};
 
 		Wt::WPushButton* starBtn {bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star"))};
 		starBtn->clicked().connect([=]
 		{
 			if (isStarred())
 			{
-				Service<Scrobbling::IScrobblingService>::get()->unstar(LmsApp->getUserId(), *artistId);
+				Service<Scrobbling::IScrobblingService>::get()->unstar(LmsApp->getUserId(), _artistId);
 				starBtn->setText(Wt::WString::tr("Lms.Explore.star"));
 			}
 			else
 			{
-				Service<Scrobbling::IScrobblingService>::get()->star(LmsApp->getUserId(), *artistId);
+				Service<Scrobbling::IScrobblingService>::get()->star(LmsApp->getUserId(), _artistId);
 				starBtn->setText(Wt::WString::tr("Lms.Explore.unstar"));
 			}
 		});
@@ -232,7 +242,6 @@ Artist::refreshReleases()
 			{
 				addSomeReleases(releases);
 			});
-			releases.container->setHasMore(true);
 		}
 	}
 	else
@@ -272,11 +281,10 @@ Artist::refreshAppearsOnReleases()
 		releaseContainer->bindString("release-type", Wt::WString::tr("Lms.Explore.Artist.appears-on"));
 		_appearsOnReleaseContainer.releases = releases.results;
 		_appearsOnReleaseContainer.container = releaseContainer->bindNew<InfiniteScrollingContainer>("releases", Wt::WString::tr("Lms.Explore.Releases.template.container"));
-		_appearsOnReleaseContainer.container->onRequestElements.connect(this, [this, &releases]
+		_appearsOnReleaseContainer.container->onRequestElements.connect(this, [this]
 		{
 			addSomeReleases(_appearsOnReleaseContainer);
 		});
-		_appearsOnReleaseContainer.container->setHasMore(true);
 	}
 	else
 	{
@@ -340,11 +348,6 @@ Artist::addSomeReleases(ReleaseContainer& releaseContainer)
 			const Database::Release::pointer release {Database::Release::find(LmsApp->getDbSession(), releaseContainer.releases[i])};
 			releaseContainer.container->add(ReleaseListHelpers::createEntryForArtist(release, artist));
 		}
-		releaseContainer.container->setHasMore(releaseContainer.container->getCount() < releaseContainer.releases.size());
-	}
-	else
-	{
-		releaseContainer.container->setHasMore(false);
 	}
 }
 
@@ -364,15 +367,10 @@ Artist::addSomeNonReleaseTracks()
 	params.setNonRelease(true);
 
 	const auto tracks {Track::find(LmsApp->getDbSession(), params)};
-	bool moreResults {tracks.moreResults};
-
 	for (const TrackId trackId : tracks.results)
 	{
 		if (_trackContainer->getCount() == _tracksMaxCount)
-		{
-			moreResults = false;
 			break;
-		}
 
 		const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)};
 		_trackContainer->add(TrackListHelpers::createEntry(track, _playQueueController, _filters));
@@ -380,8 +378,6 @@ Artist::addSomeNonReleaseTracks()
 		areTracksAdded = true;
 	}
 
-	_trackContainer->setHasMore(moreResults);
-
 	return areTracksAdded;
 }
 

src/lms/ui/explore/ArtistsView.cpp

@@ -102,9 +102,8 @@ Artists::Artists(Filters& filters)
 void
 Artists::refreshView()
 {
-	_container->clear();
+	_container->reset();
 	_artistCollector.reset();
-	addSome();
 }
 
 void
@@ -171,8 +170,6 @@ Artists::addSome()
 				_container->add(ArtistListHelpers::createEntry(artist));
 		}
 	}
-
-	_container->setHasMore(artistIds.moreResults);
 }
 
 } // namespace UserInterface

src/lms/ui/explore/PlayQueueController.cpp

@@ -138,6 +138,9 @@ namespace UserInterface
 			case Command::Play:
 				_playQueue.play(trackIds);
 				break;
+			case Command::PlayNext:
+				_playQueue.playNext(trackIds);
+				break;
 			case Command::PlayShuffled:
 				_playQueue.playShuffled(trackIds);
 				break;

src/lms/ui/explore/PlayQueueController.hpp

@@ -40,6 +40,7 @@ namespace UserInterface
 			enum class Command
 			{
 				Play,
+				PlayNext,
 				PlayOrAddLast,
 				PlayShuffled,
 			};

src/lms/ui/explore/ReleaseView.cpp

@@ -217,9 +217,15 @@ Release::refreshView()
 	if (!wApp->internalPathMatches("/release/"))
 		return;
 
-	clear();
-
 	const auto releaseId {extractReleaseIdFromInternalPath()};
+
+	// consider everything is up to date is the same release is being rendered
+	if (releaseId && *releaseId == _releaseId)
+		return;
+
+	clear();
+	_releaseId = {};
+
 	if (!releaseId)
 		throw ReleaseNotFoundException {};
 
@@ -232,6 +238,7 @@ Release::refreshView()
 		throw ReleaseNotFoundException {};
 
 	LmsApp->setTitle(release->getName());
+	_releaseId = *releaseId;
 
 	refreshCopyright(release);
 	refreshLinks(release);
@@ -281,44 +288,50 @@ Release::refreshView()
 	bindNew<Wt::WPushButton>("play-btn", Wt::WString::tr("Lms.Explore.play"), Wt::TextFormat::XHTML)
 		->clicked().connect([=]
 		{
-			_playQueueController.processCommand(PlayQueueController::Command::Play, {*releaseId});
+			_playQueueController.processCommand(PlayQueueController::Command::Play, {_releaseId});
 		});
 
 	bindNew<Wt::WPushButton>("play-shuffled", Wt::WString::tr("Lms.Explore.play-shuffled"), Wt::TextFormat::Plain)
 		->clicked().connect([=]
 		{
-			_playQueueController.processCommand(PlayQueueController::Command::PlayShuffled, {*releaseId});
+			_playQueueController.processCommand(PlayQueueController::Command::PlayShuffled, {_releaseId});
+		});
+
+	bindNew<Wt::WPushButton>("play-next", Wt::WString::tr("Lms.Explore.play-next"), Wt::TextFormat::Plain)
+		->clicked().connect([=]
+		{
+			_playQueueController.processCommand(PlayQueueController::Command::PlayNext, {_releaseId});
 		});
 
 	bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"), Wt::TextFormat::Plain)
 		->clicked().connect([=]
 		{
-			_playQueueController.processCommand(PlayQueueController::Command::PlayOrAddLast, {*releaseId});
+			_playQueueController.processCommand(PlayQueueController::Command::PlayOrAddLast, {_releaseId});
 		});
 
 	bindNew<Wt::WPushButton>("download", Wt::WString::tr("Lms.Explore.download"))
-		->setLink(Wt::WLink {std::make_unique<DownloadReleaseResource>(*releaseId)});
+		->setLink(Wt::WLink {std::make_unique<DownloadReleaseResource>(_releaseId)});
 
 	bindNew<Wt::WPushButton>("release-info", Wt::WString::tr("Lms.Explore.release-info"))
 		->clicked().connect([=]
 		{
-			showReleaseInfoModal(*releaseId);
+			showReleaseInfoModal(_releaseId);
 		});
 
 	{
-		auto isStarred {[=] { return Service<Scrobbling::IScrobblingService>::get()->isStarred(LmsApp->getUserId(), *releaseId); }};
+		auto isStarred {[=] { return Service<Scrobbling::IScrobblingService>::get()->isStarred(LmsApp->getUserId(), _releaseId); }};
 
 		Wt::WPushButton* starBtn {bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star"))};
 		starBtn->clicked().connect([=]
 		{
 			if (isStarred())
 			{
-				Service<Scrobbling::IScrobblingService>::get()->unstar(LmsApp->getUserId(), *releaseId);
+				Service<Scrobbling::IScrobblingService>::get()->unstar(LmsApp->getUserId(), _releaseId);
 				starBtn->setText(Wt::WString::tr("Lms.Explore.star"));
 			}
 			else
 			{
-				Service<Scrobbling::IScrobblingService>::get()->star(LmsApp->getUserId(), *releaseId);
+				Service<Scrobbling::IScrobblingService>::get()->star(LmsApp->getUserId(), _releaseId);
 				starBtn->setText(Wt::WString::tr("Lms.Explore.unstar"));
 			}
 		});
@@ -367,7 +380,7 @@ Release::refreshView()
 	};
 
 	Database::Track::FindParameters params;
-	params.setRelease(*releaseId);
+	params.setRelease(_releaseId);
 	params.setSortMethod(Database::TrackSortMethod::Release);
 	params.setClusters(_filters.getClusterIds());
 
@@ -416,6 +429,11 @@ Release::refreshView()
 				{
 					_playQueueController.playTrackInRelease(trackId);
 				});
+			entry->bindNew<Wt::WPushButton>("play-next", Wt::WString::tr("Lms.Explore.play-next"))
+				->clicked().connect([=]
+				{
+					_playQueueController.processCommand(PlayQueueController::Command::PlayNext, {trackId});
+				});
 			entry->bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"))
 				->clicked().connect([=]
 				{

src/lms/ui/explore/ReleaseView.hpp

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

src/lms/ui/explore/ReleasesView.cpp

@@ -79,6 +79,11 @@ Releases::Releases(Filters& filters, PlayQueueController& playQueueController)
 		{
 			_playQueueController.processCommand(PlayQueueController::Command::PlayShuffled, getAllReleases());
 		});
+	bindNew<Wt::WPushButton>("play-next", Wt::WString::tr("Lms.Explore.play-next"), Wt::TextFormat::Plain)
+		->clicked().connect([=]
+		{
+			_playQueueController.processCommand(PlayQueueController::Command::PlayNext, getAllReleases());
+		});
 	bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"), Wt::TextFormat::Plain)
 		->clicked().connect([=]
 		{
@@ -102,9 +107,8 @@ Releases::Releases(Filters& filters, PlayQueueController& playQueueController)
 void
 Releases::refreshView()
 {
-	_container->clear();
+	_container->reset();
 	_releaseCollector.reset();
-	addSome();
 }
 
 void
@@ -128,8 +132,6 @@ Releases::addSome()
 				_container->add(ReleaseListHelpers::createEntry(release));
 		}
 	}
-
-	_container->setHasMore(releaseIds.moreResults);
 }
 
 std::vector<ReleaseId>

src/lms/ui/explore/SearchView.cpp

@@ -88,9 +88,9 @@ namespace UserInterface
 	void
 	SearchView::refreshView()
 	{
-		_artists->clear();
+		_artists->reset();
-		_releases->clear();
+		_releases->reset();
-		_tracks->clear();
+		_tracks->reset();
 
 		addSomeArtists();
 		addSomeReleases();
@@ -104,7 +104,6 @@ namespace UserInterface
 
 		const Range range {_artists->getCount(), getBatchSize(Mode::Artist)};
 		const RangeResults<ArtistId> artistIds {_artistCollector.get(range)};
-
 		{
 			auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
@@ -114,8 +113,6 @@ namespace UserInterface
 				_artists->add(ArtistListHelpers::createEntry(artist));
 			}
 		}
-
-		_artists->setHasMore(artistIds.moreResults);
 	}
 
 	void
@@ -125,7 +122,6 @@ namespace UserInterface
 
 		const Range range {_releases->getCount(), getBatchSize(Mode::Release)};
 		const RangeResults<ReleaseId> releaseIds {_releaseCollector.get(range)};
-
 		{
 			auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
@@ -135,8 +131,6 @@ namespace UserInterface
 				_releases->add(ReleaseListHelpers::createEntry(release));
 			}
 		}
-
-		_releases->setHasMore(releaseIds.moreResults);
 	}
 
 	void
@@ -156,8 +150,6 @@ namespace UserInterface
 				_tracks->add(TrackListHelpers::createEntry(track, _playQueueController, _filters));
 			}
 		}
-
-		_tracks->setHasMore(trackIds.moreResults);
 	}
 } // namespace UserInterface
 

src/lms/ui/explore/TrackListHelpers.cpp

@@ -205,6 +205,11 @@ namespace UserInterface::TrackListHelpers
 		{
 			playQueueController.processCommand(PlayQueueController::Command::Play, {trackId});
 		});
+		entry->bindNew<Wt::WPushButton>("play-next", Wt::WString::tr("Lms.Explore.play-next"))
+			->clicked().connect([=, &playQueueController]
+			{
+				playQueueController.processCommand(PlayQueueController::Command::PlayNext, {trackId});
+			});
 		entry->bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"))
 			->clicked().connect([=, &playQueueController]
 			{

src/lms/ui/explore/TrackListView.cpp

@@ -179,8 +179,6 @@ namespace UserInterface
 		{
 			addSome();
 		});
-
-		addSome();
 	}
 
 	void
@@ -201,8 +199,6 @@ namespace UserInterface
 			if (const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)})
 				_container->add(TrackListHelpers::createEntry(track, _playQueueController, _filters));
 		}
-
-		_container->setHasMore(trackIds.moreResults && _container->getCount() < _maxCount);
 	}
 } // namespace UserInterface
 

src/lms/ui/explore/TrackListsView.cpp

@@ -34,7 +34,6 @@ using namespace Database;
 
 namespace UserInterface
 {
-
 	TrackLists::TrackLists(Filters& filters)
 	: Template {Wt::WString::tr("Lms.Explore.TrackLists.template")}
 	, _filters {filters}
@@ -92,9 +91,8 @@ namespace UserInterface
 	void
 	TrackLists::refreshView()
 	{
-		_container->clear();
+		_container->reset();
 		_trackListWidgets.clear();
-		addSome();
 	}
 
 	void
@@ -126,8 +124,6 @@ namespace UserInterface
 			if (const TrackList::pointer trackList {TrackList::find(LmsApp->getDbSession(), trackListId)})
 				addTracklist(trackList);
 		}
-
-		_container->setHasMore(trackListIds.moreResults && _container->getCount() <= _maxCount);
 	}
 
 	void

src/lms/ui/explore/TracksView.cpp

@@ -80,6 +80,11 @@ Tracks::Tracks(Filters& filters, PlayQueueController& playQueueController)
 		{
 			_playQueueController.processCommand(PlayQueueController::Command::PlayShuffled, getAllTracks());
 		});
+	bindNew<Wt::WPushButton>("play-next", Wt::WString::tr("Lms.Explore.play-next"), Wt::TextFormat::Plain)
+		->clicked().connect([=]
+		{
+			_playQueueController.processCommand(PlayQueueController::Command::PlayNext, getAllTracks());
+		});
 	bindNew<Wt::WPushButton>("play-last", Wt::WString::tr("Lms.Explore.play-last"), Wt::TextFormat::Plain)
 		->clicked().connect([=]
 		{
@@ -103,9 +108,8 @@ Tracks::Tracks(Filters& filters, PlayQueueController& playQueueController)
 void
 Tracks::refreshView()
 {
-	_container->clear();
+	_container->reset();
 	_trackCollector.reset();
-	addSome();
 }
 
 void
@@ -127,8 +131,6 @@ Tracks::addSome()
 		if (const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)})
 			_container->add(TrackListHelpers::createEntry(track, _playQueueController, _filters));
 	}
-
-	_container->setHasMore(trackIds.moreResults);
 }
 
 std::vector<Database::TrackId>