Merge branch 'develop' into refactoring

INSTALL.md

@@ -23,8 +23,8 @@ _Buster_ packages are provided for _amd64_ and _armhf_ architectures.
 
 As root, trust the following debian package provider and add it in your list of repositories:
 ```sh
-wget -O - https://debian.poupon.io/apt/debian/epoupon.gpg.key | apt-key add -
-echo "deb https://debian.poupon.io/apt/debian buster main" > /etc/apt/sources.list.d/epoupon.list
+wget -O - https://debian.poupon.dev/apt/debian/epoupon.gpg.key | apt-key add -
+echo "deb https://debian.poupon.dev/apt/debian buster main" > /etc/apt/sources.list.d/epoupon.list
 ```
 
 To install or upgrade _LMS_:
@@ -65,7 +65,7 @@ cmake .. -DCMAKE_BUILD_TYPE=Release
 ```
 __Notes__:
 * you can customize the installation directory using `-DCMAKE_INSTALL_PREFIX=path` (defaults to `/usr/local`).
-* you can customize the image library using `-DIMAGE_LIBRARY=<STB|GraphicksMagick++>`
+* you can customize the image library using `-DIMAGE_LIBRARY=<STB|GraphicsMagick++>`
 
 ```sh
 make

README.md

@@ -4,7 +4,7 @@
 
 _LMS_ is a self-hosted music streaming software: access your music collection from anywhere using a web interface!
 
-A [demo instance](http://lms.demo.poupon.io) is available. Note the administration panel is not available.
+A [demo instance](http://lms-demo.poupon.dev) is available. Note the administration panel is not available.
 
 ## Main features
 * Low memory requirements: the demo instance runs on a _Raspberry Pi Zero W_

approot/mediaplayer.xml

@@ -35,7 +35,7 @@
 				</div>
 			</div>
 			<div class="hidden-xs col-sm-2 col-md-2 Lms-player-duration text-muted">
-				<a id="lms-transcoding-active" class="Lms-player-btn Lms-btn" data-toggle="tooltip" title="${tr:Lms.Player.transcoding-active}" style="visibility:hidden"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></a>
+				<span id="lms-transcoding-active" class="Lms-player-btn Lms-btn" data-toggle="tooltip" title="${tr:Lms.Player.transcoding-active}" style="visibility:hidden"><i class="fa fa-fw fa-info-circle" aria-hidden="true"></i></span>
 				<span id="lms-mp-curtime">--</span> / <span id="lms-mp-duration">--</span>
 			</div>
 		</div>

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

@@ -34,6 +34,8 @@ namespace Database
 			const T* operator->() const { return _obj.get(); }
 			operator bool() const { return _obj.get(); }
 			bool operator!() const { return !_obj.get(); }
+			bool operator==(const ObjectPtr& other) const { return _obj == other._obj; }
+			bool operator!=(const ObjectPtr& other) const { return other._obj != _obj; }
 
 			auto modify() { return _obj.modify(); }
 			void remove() { _obj.remove(); }

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

@@ -46,7 +46,21 @@ TEST_F(DatabaseFixture, Track)
 	}
 }
 
-TEST_F(DatabaseFixture, Track_findByKeywords)
+TEST_F(DatabaseFixture, MultipleTracks)
+{
+	ScopedTrack track1 {session, "MyTrackFile1"};
+	ScopedTrack track2 {session, "MyTrackFile2"};
+
+	{
+		auto transaction {session.createSharedTransaction()};
+
+		EXPECT_TRUE(track1.getId() != track2.getId());
+		EXPECT_TRUE(track1.get() != track2.get());
+		EXPECT_FALSE(track1.get() == track2.get());
+	}
+}
+
+TEST_F(DatabaseFixture, MultipleTracksSearchByFilter)
 {
 	ScopedTrack track1 {session, ""};
 	ScopedTrack track2 {session, ""};

src/lms/ui/admin/UsersView.cpp

@@ -71,6 +71,7 @@ UsersView::refreshView()
 
 	auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
+	const User::IdType currentUserId {LmsApp->getUser()};
 	for (const UserId userId : User::find(LmsApp->getDbSession(), User::FindParameters {}).results)
 	{
 		const User::pointer user {User::find(LmsApp->getDbSession(), userId)};
@@ -87,7 +88,7 @@ UsersView::refreshView()
 		}
 
 		// Don't edit ourself this way
-		if (LmsApp->getUser() == user)
+		if (user->getId() == currentUserId)
 			continue;
 
 		entry->setCondition("if-edit", true);