Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-29 16:49:27 +01:00
Code Issues Releases Wiki Activity

TagReaderTagLib: Handle multiple values for ID3v2 tags

Browse Source
This commit is contained in:
Jonas Kvinge 2024-11-08 21:37:45 +01:00
parent 777fec9a92
commit 904ffb1417
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tagreader/tagreadertaglib.cpp
View File

@ -597,7 +597,7 @@ void TagReaderTagLib::ParseID3v2Tags(TagLib::ID3v2::Tag *tag, QString *disc, QSt
for (uint i = 0; i < map[kID3v2_UserDefinedTextInformationFrame].size(); ++i) {
if (TagLib::ID3v2::UserTextIdentificationFrame *frame = dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>(map[kID3v2_UserDefinedTextInformationFrame][i])) {
const TagLib::StringList frame_field_list = frame->fieldList();
if (frame_field_list.size() != 2) continue;
if (frame_field_list.size() < 2) continue;
if (frame->description() == kID3v2_AcoustId) {
song->set_acoustid_id(frame_field_list.back());
}
@ -605,13 +605,13 @@ void TagReaderTagLib::ParseID3v2Tags(TagLib::ID3v2::Tag *tag, QString *disc, QSt
song->set_acoustid_fingerprint(frame_field_list.back());
}
if (frame->description() == kID3v2_MusicBrainz_AlbumArtistId) {
song->set_musicbrainz_album_artist_id(frame_field_list.back());
song->set_musicbrainz_album_artist_id(TagLibStringListToSlashSeparatedString(frame_field_list, 1));
}
if (frame->description() == kID3v2_MusicBrainz_ArtistId) {
song->set_musicbrainz_artist_id(frame_field_list.back());
song->set_musicbrainz_artist_id(TagLibStringListToSlashSeparatedString(frame_field_list, 1));
}
if (frame->description() == kID3v2_MusicBrainz_OriginalArtistId) {
song->set_musicbrainz_original_artist_id(frame_field_list.back());
song->set_musicbrainz_original_artist_id(TagLibStringListToSlashSeparatedString(frame_field_list, 1));
}
if (frame->description() == kID3v2_MusicBrainz_AlbumId) {
song->set_musicbrainz_album_id(frame_field_list.back());
@ -629,7 +629,7 @@ void TagReaderTagLib::ParseID3v2Tags(TagLib::ID3v2::Tag *tag, QString *disc, QSt
song->set_musicbrainz_release_group_id(frame_field_list.back());
}
if (frame->description() == kID3v2_MusicBrainz_WorkId) {
song->set_musicbrainz_work_id(frame_field_list.back());
song->set_musicbrainz_work_id(TagLibStringListToSlashSeparatedString(frame_field_list, 1));
}
}
}
@ -1874,10 +1874,11 @@ TagReaderResult TagReaderTagLib::SaveSongRating(const QString &filename, const f
}
TagLib::String TagReaderTagLib::TagLibStringListToSlashSeparatedString(const TagLib::StringList &taglib_string_list) {
TagLib::String TagReaderTagLib::TagLibStringListToSlashSeparatedString(const TagLib::StringList &taglib_string_list, const uint begin_index) {
TagLib::String result_string;
for (const TagLib::String &taglib_string : taglib_string_list) {
for (uint i = begin_index ; i < taglib_string_list.size(); ++i) {
const TagLib::String &taglib_string = taglib_string_list[i];
if (!result_string.isEmpty()) {
result_string += '/';
}

2
src/tagreader/tagreadertaglib.h
View File

@ -116,7 +116,7 @@ class TagReaderTagLib : public TagReaderBase {
void SetEmbeddedCover(TagLib::ID3v2::Tag *tag, const QByteArray &data, const QString &mimetype) const;
void SetEmbeddedCover(TagLib::MP4::File *aac_file, TagLib::MP4::Tag *tag, const QByteArray &data, const QString &mimetype) const;
static TagLib::String TagLibStringListToSlashSeparatedString(const TagLib::StringList &taglib_string_list);
static TagLib::String TagLibStringListToSlashSeparatedString(const TagLib::StringList &taglib_string_list, const uint begin_index = 0);
private:
FileRefFactory *factory_;