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

Better handle multiple artists in wma files (+add debug info), ref #597

Browse Source
This commit is contained in:
emeric
2025-03-15 15:46:44 +01:00
parent 05000d8a1a
commit 48f6eb1cc5
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/metadata/impl/TagLibTagReader.cpp
+21 -7
View File
@@ -328,25 +328,39 @@ namespace lms::metadata
if (attributeList.isEmpty()) if (attributeList.isEmpty())
continue; continue;
std::string strName{ core::stringUtils::stringToUpper(name.to8Bit(true)) }; const std::string strName{ core::stringUtils::stringToUpper(name.to8Bit(true)) };
if (strName.find("WM/") == 0 || _propertyMap.find(strName) != std::cend(_propertyMap)) if (debug)
{
for (const auto& attribute : attributeList)
LMS_LOG(METADATA, DEBUG, "ASF Attribute, Key = '" << strName << "', value = '" << (attribute.type() == TagLib::ASF::Attribute::AttributeTypes::UnicodeType ? attribute.toString() : TagLib::String{ "<Non unicode>" }) << "'");
}
if (strName.find("WM/") == 0 || _propertyMap.contains(strName))
continue; continue;
TagLib::StringList attributes; TagLib::StringList strAttributes;
for (const TagLib::ASF::Attribute& attribute : attributeList) for (const TagLib::ASF::Attribute& attribute : attributeList)
{ {
if (attribute.type() == TagLib::ASF::Attribute::AttributeTypes::UnicodeType) if (attribute.type() == TagLib::ASF::Attribute::AttributeTypes::UnicodeType)
attributes.append(attribute.toString()); strAttributes.append(attribute.toString());
} }
if (!attributes.isEmpty()) if (!strAttributes.isEmpty())
_propertyMap[strName] = std::move(attributes); _propertyMap[strName] = strAttributes;
} }
// Merge artists that may have been saved only in Author (see #597)
if (auto itAuthor{ _propertyMap.find("AUTHOR") }; itAuthor != _propertyMap.end() && _propertyMap.unsupportedData().contains("Author")) if (auto itAuthor{ _propertyMap.find("AUTHOR") }; itAuthor != _propertyMap.end() && _propertyMap.unsupportedData().contains("Author"))
{ {
if (!_propertyMap.contains("ARTISTS")) if (!_propertyMap.contains("ARTISTS"))
_propertyMap["ARTIST"].append(itAuthor->second); {
auto& artistEntries{ _propertyMap["ARTIST"] };
for (const auto& author : itAuthor->second)
{
if (!artistEntries.contains(author))
artistEntries.append(author);
}
}
} }
} }
} }