diff --git a/autotests/taglibwritertest.cpp b/autotests/taglibwritertest.cpp --- a/autotests/taglibwritertest.cpp +++ b/autotests/taglibwritertest.cpp @@ -277,7 +277,7 @@ writerPlugin.write(data); - KFileMetaData::SimpleExtractionResult result(temporaryFileName, mimeType, KFileMetaData::ExtractionResult::ExtractMetaData); + KFileMetaData::SimpleExtractionResult result(temporaryFileName, mimeType); extractResult(mimeType, result); QCOMPARE(result.properties().value(Property::Composer), QVariant(QStringLiteral("Composer1"))); @@ -362,7 +362,7 @@ data.add(Property::Rating, rating); writerPlugin.write(data); - KFileMetaData::SimpleExtractionResult result(temporaryFileName, mimeType, KFileMetaData::ExtractionResult::ExtractMetaData); + KFileMetaData::SimpleExtractionResult result(temporaryFileName, mimeType); extractResult(mimeType, result); QCOMPARE(result.properties().value(Property::Rating).toInt(), rating); @@ -567,7 +567,7 @@ writerPlugin.write(data); - KFileMetaData::SimpleExtractionResult result(temporaryFileName, mimeType, KFileMetaData::ExtractionResult::ExtractMetaData); + KFileMetaData::SimpleExtractionResult result(temporaryFileName, mimeType); extractResult(mimeType, result); for (it = properties.begin(); it != properties.end(); ++it) { diff --git a/src/extractors/taglibextractor.cpp b/src/extractors/taglibextractor.cpp --- a/src/extractors/taglibextractor.cpp +++ b/src/extractors/taglibextractor.cpp @@ -160,9 +160,6 @@ if (savedProperties.contains("COMPILATION")) { result->add(Property::Compilation, TStringToQString(savedProperties["COMPILATION"].toString()).trimmed()); } - if (savedProperties.contains("LYRICS")) { - result->add(Property::Lyrics, TStringToQString(savedProperties["LYRICS"].toString()).trimmed()); - } if (savedProperties.contains("ARTIST")) { const auto artists = savedProperties["ARTIST"]; for (const auto& artist : artists) { @@ -258,6 +255,9 @@ result->add(Property::ReplayGainAlbumPeak, replayGainAlbumPeak); } } + if (result->inputFlags() & ExtractionResult::ExtractPlainText && savedProperties.contains("LYRICS")) { + result->add(Property::Lyrics, TStringToQString(savedProperties["LYRICS"].toString()).trimmed()); + } } void TagLibExtractor::extractId3Tags(TagLib::ID3v2::Tag* Id3Tags, ExtractionResult* result)