owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Implement inline artist credits

Browse Source 
For now, it's always shown. Soon, I will be implementing a setting to chose whether to show everything, remixers only, or nothing.
This commit is contained in:
Daniel Thirion
2025-03-04 10:46:52 +01:00
parent 6608063d61
commit 2e5c9e9218
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/release.xml
+3 -3
View File
@@ -123,9 +123,9 @@
</div> </div>
</div> </div>
</div> </div>
${<if-has-remixers>}<div class="ms-5 pb-2 px-2 text-small"> ${<if-has-artist-links>}
Remixer — ${remixers class="d-inline d-md-inline"} ${artist-links}
</div>${</if-has-remixers>} ${</if-has-artist-links>}
</message> </message>
<message id="Lms.Explore.Release.template.release-info"> <message id="Lms.Explore.Release.template.release-info">
src/lms/ui/explore/ReleaseView.cpp
+38 -5
View File
@@ -437,11 +437,44 @@ namespace lms::ui
entry->bindWidget("artists-md", utils::createArtistDisplayNameWithAnchors(track->getArtistDisplayName(), artists)); entry->bindWidget("artists-md", utils::createArtistDisplayNameWithAnchors(track->getArtistDisplayName(), artists));
} }
const auto remixers{ track->getArtistIds({ TrackArtistLinkType::Remixer }) }; { // Generate all artist link widgets
if (!remixers.empty()) // TODO: add config to chose whether to only show Remixer or show All.
{ std::vector<std::pair<Wt::WString, std::unique_ptr<Wt::WContainerWidget>>> artistLinksList;
entry->setCondition("if-has-remixers", true); auto createTrackArtistLink = [&](TrackArtistLinkType linkType, const std::string& trkey) {
entry->bindWidget("remixers", utils::createArtistDisplayNameWithAnchors(track->getArtistDisplayName(), remixers)); const auto artists{ track->getArtistIds({ linkType }) };
const auto text = Wt::WString::trn(trkey, artists.size()).arg(artists.size());
auto anchors{ utils::createArtistAnchorList(std::vector(std::cbegin(artists), std::cend(artists))) };
if (!artists.empty())
{
auto myPair = std::make_pair(text, std::move(anchors));
artistLinksList.push_back(std::move(myPair));
}
};
createTrackArtistLink(TrackArtistLinkType::Remixer, "Lms.Explore.Artists.linktype-remixer");
createTrackArtistLink(TrackArtistLinkType::Producer, "Lms.Explore.Artists.linktype-producer");
createTrackArtistLink(TrackArtistLinkType::Performer, "Lms.Explore.Artists.linktype-performer");
createTrackArtistLink(TrackArtistLinkType::Composer, "Lms.Explore.Artists.linktype-composer");
createTrackArtistLink(TrackArtistLinkType::Conductor, "Lms.Explore.Artists.linktype-conductor");
createTrackArtistLink(TrackArtistLinkType::Lyricist, "Lms.Explore.Artists.linktype-lyricist");
createTrackArtistLink(TrackArtistLinkType::Mixer, "Lms.Explore.Artists.linktype-mixer");
if (!artistLinksList.empty())
{
entry->setCondition("if-has-artist-links", true);
Wt::WContainerWidget* artistLinksContainer = entry->bindNew<Wt::WContainerWidget>("artist-links");
for (auto& [role, artistWidget] : artistLinksList)
{
auto* currContainer = artistLinksContainer->addNew<Wt::WContainerWidget>();
currContainer->setStyleClass("overflow-hidden ms-5 pb-2 px-2 text-small d-flex");
auto* roleText = currContainer->addNew<Wt::WText>(role + Wt::WString::fromUTF8("&nbsp;—&nbsp;"));
roleText->setStyleClass("d-inline");
auto* newArtistWidget = currContainer->addWidget(std::move(artistWidget));
newArtistWidget->setInline(true);
}
}
} }
auto trackNumber{ track->getTrackNumber() }; auto trackNumber{ track->getTrackNumber() };