Fixed last join phrase not being displayed in UI, fixes #528
This commit is contained in:
@@ -337,6 +337,23 @@ namespace lms::metadata
|
|||||||
EXPECT_EQ(track->artistDisplayName, "Artist1, Artist2"); // reconstruct artist display name since multiple entries are found and nothing is set in artist
|
EXPECT_EQ(track->artistDisplayName, "Artist1, Artist2"); // reconstruct artist display name since multiple entries are found and nothing is set in artist
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(Parser, multipleArtistsInArtistsWithEndDelimiter)
|
||||||
|
{
|
||||||
|
const TestTagReader testTags{
|
||||||
|
{
|
||||||
|
{ TagType::Artist, { "Artist1 & (CV. Artist2)" } },
|
||||||
|
{ TagType::Artists, { "Artist1", "Artist2" } },
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
std::unique_ptr<Track> track{ Parser{}.parse(testTags) };
|
||||||
|
|
||||||
|
ASSERT_EQ(track->artists.size(), 2);
|
||||||
|
EXPECT_EQ(track->artists[0].name, "Artist1");
|
||||||
|
EXPECT_EQ(track->artists[1].name, "Artist2");
|
||||||
|
EXPECT_EQ(track->artistDisplayName, "Artist1 & (CV. Artist2)");
|
||||||
|
}
|
||||||
|
|
||||||
TEST(Parser, singleArtistInAlbumArtists)
|
TEST(Parser, singleArtistInAlbumArtists)
|
||||||
{
|
{
|
||||||
const TestTagReader testTags{
|
const TestTagReader testTags{
|
||||||
|
|||||||
@@ -212,8 +212,14 @@ namespace lms::ui::utils
|
|||||||
matchCount += 1;
|
matchCount += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (matchCount != artistIds.size())
|
if (matchCount == artistIds.size())
|
||||||
return createArtistAnchorList(artistIds, cssAnchorClass);
|
{
|
||||||
|
const std::string_view remainingStr{ displayName.substr(currentOffset) };
|
||||||
|
if (!remainingStr.empty())
|
||||||
|
result->addNew<Wt::WText>(std::string{ remainingStr }, Wt::TextFormat::Plain);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
result = createArtistAnchorList(artistIds, cssAnchorClass);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user