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

Better handle tags when no role is set

Browse Source
This commit is contained in:
emeric
2022-12-17 15:33:16 +01:00
parent 6a87c26103
commit ce28aa9533
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/metadata/impl/TagLibParser.cpp
+11 -13
View File
@@ -140,6 +140,7 @@ getPerformerArtists(const TagLib::PropertyMap& properties,
PerformerContainer performers; PerformerContainer performers;
// picard stores like this: (see https://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#performer) // picard stores like this: (see https://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#performer)
// We may hit both styles for the same track
// PERFORMER: artist (role) // PERFORMER: artist (role)
if (const std::vector<std::string> artistNames {getPropertyValuesFirstMatchAs<std::string>(properties, artistTagNames)}; !artistNames.empty()) if (const std::vector<std::string> artistNames {getPropertyValuesFirstMatchAs<std::string>(properties, artistTagNames)}; !artistNames.empty())
{ {
@@ -151,23 +152,20 @@ getPerformerArtists(const TagLib::PropertyMap& properties,
} }
} }
// PERFORMER:role (MP3) // PERFORMER:role (MP3)
else for (const auto& [key, values] : properties)
{ {
for (const auto& [key, values] : properties) if (key.startsWith("PERFORMER:"))
{ {
if (key.startsWith("PERFORMER")) std::string performerStr {key.to8Bit(true)};
std::string role;
if (const std::size_t rolePos {performerStr.find(':')}; rolePos != std::string::npos)
{ {
std::string performerStr {key.to8Bit(true)}; role = StringUtils::stringToLower(performerStr.substr(rolePos + 1, performerStr.size() - rolePos + 1));
std::string role; StringUtils::capitalize(role);
if (const std::size_t rolePos {performerStr.find(':')}; rolePos != std::string::npos)
{
role = StringUtils::stringToLower(performerStr.substr(rolePos + 1, performerStr.size() - rolePos + 1));
StringUtils::capitalize(role);
}
for (const auto& value : values)
performers[role].push_back(Artist {value.to8Bit(true)});
} }
for (const auto& value : values)
performers[role].push_back(Artist {value.to8Bit(true)});
} }
} }