From 735c170a447a2fe3275027a0ffa29d4497d53156 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Thu, 16 Jul 2026 18:54:48 +0200
Subject: [PATCH] Improved work display, when available, ref #834

---
 approot/playqueue.xml                   | 15 ++++++++-------
 approot/tracks.xml                      | 15 ++++++++-------
 src/lms/ui/MediaPlayer.cpp              |  2 +-
 src/lms/ui/PlayQueue.cpp                | 13 +++++++++----
 src/lms/ui/Utils.cpp                    | 21 ++++++++++++++-------
 src/lms/ui/Utils.hpp                    |  9 +++++++--
 src/lms/ui/explore/TrackListHelpers.cpp | 13 +++++++++----
 7 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/approot/playqueue.xml b/approot/playqueue.xml
index 2f6f2453..468c1c72 100644
--- a/approot/playqueue.xml
+++ b/approot/playqueue.xml
@@ -40,18 +40,19 @@
 		<div class="p-1">
 			${cover}
 		</div>
-		<div class="row align-items-center flex-fill overflow-hidden">
+		<div class="row align-items-center flex-fill">
 			<div class="col-12 col-md-6 col-lg-4">
-				<div class="p-2 overflow-hidden">
-					<div class="d-block text-truncate">${name}</div>
-					${<if-has-artists>}${artists class="d-block d-md-none text-truncate"}${</if-has-artists>}
+				<div class="p-2">
+					<div class="d-block">${name}</div>
+					${<if-has-artists>}${artists class="d-block d-md-none"}${</if-has-artists>}
+					${<if-has-work>}<div class="text-muted small ms-2">${work}</div>${</if-has-work>}
 				</div>
 			</div>
 			<div class="col-md-6 col-lg-4">
-				${<if-has-artists>}${artists-md class="d-none d-md-block text-truncate"}${</if-has-artists>}
+				${<if-has-artists>}${artists-md class="d-none d-md-block"}${</if-has-artists>}
 			</div>
-			<div class="col-lg-4 text-truncate">
-				${<if-has-release>}${release class="d-none d-lg-inline text-truncate text-decoration-none link-success"}${</if-has-release>}
+			<div class="col-lg-4">
+				${<if-has-release>}${release class="d-none d-lg-inline text-decoration-none link-success"}${</if-has-release>}
 			</div>
 		</div>
 		<div class="p-2 d-none d-sm-block text-muted text-center Lms-tracks-entry-duration">
diff --git a/approot/tracks.xml b/approot/tracks.xml
index 76dba9ae..b931dcae 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -32,18 +32,19 @@
 		<div class="p-1">
 			${cover}
 		</div>
-		<div class="row align-items-center flex-fill overflow-hidden">
+		<div class="row align-items-center flex-fill">
 			<div class="col-12 col-md-6 col-lg-4">
-				<div class="p-2 overflow-hidden">
-					<div class="d-block text-truncate">${name}</div>
-					${<if-has-artists>}${artists class="d-block d-md-none text-truncate"}${</if-has-artists>}
+				<div class="p-2">
+					<div class="d-block">${name}</div>
+					${<if-has-artists>}${artists class="d-block d-md-none"}${</if-has-artists>}
+					${<if-has-work>}<div class="text-muted small ms-2">${work}</div>${</if-has-work>}
 				</div>
 			</div>
 			<div class="col-md-6 col-lg-4">
-				${<if-has-artists>}${artists-md class="d-none d-md-block text-truncate"}${</if-has-artists>}
+				${<if-has-artists>}${artists-md class="d-none d-md-block"}${</if-has-artists>}
 			</div>
-			<div class="col-lg-4 text-truncate">
-				${<if-has-release>}${release class="d-none d-lg-inline text-truncate text-decoration-none link-success"}${</if-has-release>}
+			<div class="col-lg-4">
+				${<if-has-release>}${release class="d-none d-lg-inline text-decoration-none link-success"}${</if-has-release>}
 			</div>
 		</div>
 		<div class="p-2 d-none d-sm-block text-muted text-center Lms-tracks-entry-duration">
diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp
index 5e33226e..5c3aa1f6 100644
--- a/src/lms/ui/MediaPlayer.cpp
+++ b/src/lms/ui/MediaPlayer.cpp
@@ -244,7 +244,7 @@ namespace lms::ui
             const std::string nativeResource{ _audioFileResource->getUrl(trackId) };
 
             const auto artistDisplayInfo{ utils::computeArtistDisplayInfo(track, db::TrackArtistLinkType::Artist) };
-            const std::string displayTitle{ utils::computeTrackDisplayTitle(track) };
+            const std::string displayTitle{ utils::computeTrackDisplayInfo(track).title };
 
             oss
                 << "var params = {"
diff --git a/src/lms/ui/PlayQueue.cpp b/src/lms/ui/PlayQueue.cpp
index a1d0eb23..46d3647e 100644
--- a/src/lms/ui/PlayQueue.cpp
+++ b/src/lms/ui/PlayQueue.cpp
@@ -497,12 +497,17 @@ namespace lms::ui
         const auto track{ tracklistEntry->getTrack() };
         const db::TrackId trackId{ track->getId() };
 
-        const std::string displayTitle{ utils::computeTrackDisplayTitle(track) };
+        const utils::TrackDisplayInfo displayInfo{ utils::computeTrackDisplayInfo(track) };
 
         Template* entry{ _entriesContainer->addNew<Template>(Wt::WString::tr("Lms.PlayQueue.template.entry")) };
         entry->addFunction("id", &Wt::WTemplate::Functions::id);
 
-        entry->bindString("name", Wt::WString::fromUTF8(displayTitle), Wt::TextFormat::Plain);
+        entry->bindString("name", Wt::WString::fromUTF8(displayInfo.title), Wt::TextFormat::Plain);
+        if (displayInfo.workName)
+        {
+            entry->setCondition("if-has-work", true);
+            entry->bindString("work", Wt::WString::fromUTF8(*displayInfo.workName), Wt::TextFormat::Plain);
+        }
 
         const auto artists{ track->getArtistIds({ db::TrackArtistLinkType::Artist }) };
         if (!artists.empty())
@@ -541,7 +546,7 @@ namespace lms::ui
         entry->bindString("duration", utils::durationToString(track->getDuration()), Wt::TextFormat::Plain);
 
         Wt::WPushButton* playBtn{ entry->bindNew<Wt::WPushButton>("play-btn", Wt::WString::tr("Lms.template.play-btn"), Wt::TextFormat::XHTML) };
-        playBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.play-item").arg(displayTitle));
+        playBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.play-item").arg(displayInfo.title));
         playBtn->clicked().connect([this, entry] {
             const std::optional<std::size_t> pos{ _entriesContainer->getIndexOf(*entry) };
             if (pos)
@@ -549,7 +554,7 @@ namespace lms::ui
         });
 
         Wt::WPushButton* delBtn{ entry->bindNew<Wt::WPushButton>("del-btn", Wt::WString::tr("Lms.template.delete-btn"), Wt::TextFormat::XHTML) };
-        delBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.delete-item").arg(displayTitle));
+        delBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.delete-item").arg(displayInfo.title));
         delBtn->setToolTip(Wt::WString::tr("Lms.delete"));
         delBtn->clicked().connect([this, tracklistEntryId, entry] {
             // Remove the entry n both the widget tree and the playqueue
diff --git a/src/lms/ui/Utils.cpp b/src/lms/ui/Utils.cpp
index 134e11ec..530c6277 100644
--- a/src/lms/ui/Utils.cpp
+++ b/src/lms/ui/Utils.cpp
@@ -43,6 +43,7 @@
 #include "database/objects/Track.hpp"
 #include "database/objects/TrackArtistLink.hpp"
 #include "database/objects/TrackList.hpp"
+#include "database/objects/Work.hpp"
 
 #include "LmsApplication.hpp"
 #include "ModalManager.hpp"
@@ -562,25 +563,31 @@ namespace lms::ui::utils
         LmsApp->doJavaScript("navigator.clipboard.writeText('" + core::stringUtils::jsEscape(text) + "').catch(function(){})");
     }
 
-    std::string computeTrackDisplayTitle(const db::ObjectPtr<db::Track>& track)
+    TrackDisplayInfo computeTrackDisplayInfo(const db::ObjectPtr<db::Track>& track)
     {
         const auto movements{ track->getMovements() };
         if (!movements.empty() && track->hasWork())
         {
             const db::Movement::pointer& movement{ movements.front() };
-            std::string result;
+            std::string title;
             if (const auto n{ movement->getNumber() })
             {
                 if (const std::string numeral{ core::stringUtils::toRomanNumeral(*n) }; !numeral.empty())
-                    result += numeral + ". ";
+                    title += numeral + ". ";
             }
 
-            result += movement->getName();
+            title += movement->getName();
 
-            if (!result.empty())
-                return result;
+            if (!title.empty())
+            {
+                TrackDisplayInfo info{ .title = std::move(title), .workName = std::nullopt };
+                if (const auto works{ track->getWorks() }; !works.empty())
+                    info.workName = std::string{ works.front()->getName() };
+
+                return info;
+            }
         }
 
-        return std::string{ track->getName() };
+        return TrackDisplayInfo{ .title = std::string{ track->getName() }, .workName = std::nullopt };
     }
 } // namespace lms::ui::utils
diff --git a/src/lms/ui/Utils.hpp b/src/lms/ui/Utils.hpp
index 81f4dccf..067f6ec1 100644
--- a/src/lms/ui/Utils.hpp
+++ b/src/lms/ui/Utils.hpp
@@ -21,6 +21,7 @@
 
 #include <chrono>
 #include <map>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -104,6 +105,10 @@ namespace lms::ui::utils
 
     void copyToClipboard(std::string_view text);
 
-    // Returns "i. MovementName" when track has work(s) + movement(s), otherwise track->getName().
-    std::string computeTrackDisplayTitle(const db::ObjectPtr<db::Track>& track);
+    struct TrackDisplayInfo
+    {
+        std::string title;                   // "i. MovementName" when track has work + movement, otherwise just the track's title
+        std::optional<std::string> workName; // only set when title comes from a movement
+    };
+    TrackDisplayInfo computeTrackDisplayInfo(const db::ObjectPtr<db::Track>& track);
 } // namespace lms::ui::utils
diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp
index 7e83b0fe..96a3f963 100644
--- a/src/lms/ui/explore/TrackListHelpers.cpp
+++ b/src/lms/ui/explore/TrackListHelpers.cpp
@@ -230,8 +230,13 @@ namespace lms::ui::TrackListHelpers
         auto entry{ std::make_unique<Template>(Wt::WString::tr("Lms.Explore.Tracks.template.entry")) };
         auto* entryPtr{ entry.get() };
 
-        const std::string displayTitle{ utils::computeTrackDisplayTitle(track) };
-        entry->bindString("name", Wt::WString::fromUTF8(displayTitle), Wt::TextFormat::Plain);
+        const utils::TrackDisplayInfo displayInfo{ utils::computeTrackDisplayInfo(track) };
+        entry->bindString("name", Wt::WString::fromUTF8(displayInfo.title), Wt::TextFormat::Plain);
+        if (displayInfo.workName)
+        {
+            entry->setCondition("if-has-work", true);
+            entry->bindString("work", Wt::WString::fromUTF8(*displayInfo.workName), Wt::TextFormat::Plain);
+        }
 
         const db::Release::pointer release{ track->getRelease() };
         const db::TrackId trackId{ track->getId() };
@@ -270,7 +275,7 @@ namespace lms::ui::TrackListHelpers
         entry->bindString("duration", utils::durationToString(track->getDuration()), Wt::TextFormat::Plain);
 
         Wt::WPushButton* playBtn{ entry->bindNew<Wt::WPushButton>("play-btn", Wt::WString::tr("Lms.template.play-btn"), Wt::TextFormat::XHTML) };
-        playBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.play-item").arg(displayTitle));
+        playBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.play-item").arg(displayInfo.title));
         playBtn->clicked().connect([trackId, &playQueueController] {
             db::TrackId trackIds[]{ trackId };
             playQueueController.processCommand(PlayQueueController::Command::Play, trackIds);
@@ -302,7 +307,7 @@ namespace lms::ui::TrackListHelpers
             auto isStarred{ [=] { return core::Service<feedback::IFeedbackService>::get()->isStarred(LmsApp->getUserId(), trackId); } };
 
             Wt::WPushButton* starBtn{ entry->bindNew<Wt::WPushButton>("star-btn", Wt::WString::tr(isStarred() ? "Lms.template.unstar-btn" : "Lms.template.star-btn"), Wt::TextFormat::XHTML) };
-            starBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.Explore.star-item").arg(displayTitle));
+            starBtn->setAttributeValue("aria-label", Wt::WString::tr("Lms.Explore.star-item").arg(displayInfo.title));
             starBtn->setAttributeValue("aria-pressed", isStarred() ? "true" : "false");
             Wt::WPushButton* starMenuEntry{ entry->bindNew<Wt::WPushButton>("star", Wt::WString::tr(isStarred() ? "Lms.Explore.unstar" : "Lms.Explore.star")) };