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

Fixed track artist sometimes not displayed, fixes #638

Browse Source
This commit is contained in:
emeric
2025-03-16 14:39:01 +01:00
parent a48b246022
commit 2ec8415c07
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms/ui/explore/ReleaseView.cpp
+24 -3
View File
@@ -211,6 +211,28 @@ namespace lms::ui
artistLinkEntry->bindWidget("anchors", utils::createArtistAnchorList(std::vector<db::ArtistId>(std::cbegin(artists), std::cend(artists)))); artistLinkEntry->bindWidget("anchors", utils::createArtistAnchorList(std::vector<db::ArtistId>(std::cbegin(artists), std::cend(artists))));
} }
} }
bool shouldDisplayTrackArtists(db::ReleaseId releaseId)
{
bool res{ true };
db::Artist::FindParameters params;
params.setRelease(releaseId);
params.setLinkType(db::TrackArtistLinkType::ReleaseArtist);
auto releaseArtists{ db::Artist::findIds(LmsApp->getDbSession(), params) };
params.setLinkType(db::TrackArtistLinkType::Artist);
auto trackArtists{ db::Artist::findIds(LmsApp->getDbSession(), params) };
if (trackArtists.results.size() == 1)
{
if (releaseArtists.results.empty() || trackArtists.results == releaseArtists.results)
res = false;
}
return res;
}
} // namespace } // namespace
Release::Release(Filters& filters, PlayQueueController& playQueueController) Release::Release(Filters& filters, PlayQueueController& playQueueController)
@@ -368,7 +390,7 @@ namespace lms::ui
Wt::WContainerWidget* rootContainer{ bindNew<Wt::WContainerWidget>("container") }; Wt::WContainerWidget* rootContainer{ bindNew<Wt::WContainerWidget>("container") };
const bool variousArtists{ release->hasVariousArtists() }; bool displayTrackArtists{ shouldDisplayTrackArtists(*releaseId) };
const auto totalDisc{ release->getTotalDisc() }; const auto totalDisc{ release->getTotalDisc() };
const std::size_t discCount{ release->getDiscCount() }; const std::size_t discCount{ release->getDiscCount() };
const bool hasDiscSubtitle{ release->hasDiscSubtitle() }; const bool hasDiscSubtitle{ release->hasDiscSubtitle() };
@@ -455,8 +477,7 @@ namespace lms::ui
entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain);
const auto artists{ track->getArtistIds({ TrackArtistLinkType::Artist }) }; const auto artists{ track->getArtistIds({ TrackArtistLinkType::Artist }) };
// TODO: display artist if it is single and not the one of the release (variousArtists is false in that case) if (displayTrackArtists && !artists.empty())
if (variousArtists && !artists.empty())
{ {
entry->setCondition("if-has-artists", true); entry->setCondition("if-has-artists", true);
entry->bindWidget("artists", utils::createArtistDisplayNameWithAnchors(track->getArtistDisplayName(), artists)); entry->bindWidget("artists", utils::createArtistDisplayNameWithAnchors(track->getArtistDisplayName(), artists));