Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix ItemFromSong() missing album id

This commit is contained in:
Jonas Kvinge 2019-06-07 22:54:34 +02:00
parent e19b840ee6
commit 7cc0d6bb5a
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/collection/collectionmodel.cpp
View File

@ -1111,12 +1111,22 @@ CollectionItem *CollectionModel::ItemFromSong(GroupBy type, bool signal, bool cr
CollectionItem *item = InitItem(type, signal, parent, container_level); CollectionItem *item = InitItem(type, signal, parent, container_level);
switch (type) { switch (type) {
case GroupBy_AlbumArtist:
item->key = s.effective_albumartist();
item->display_text = TextOrUnknown(item->key);
item->sort_text = SortTextForArtist(item->key);
break;
case GroupBy_Artist: case GroupBy_Artist:
item->key = s.artist(); item->key = s.artist();
item->display_text = TextOrUnknown(item->key); item->display_text = TextOrUnknown(item->key);
item->sort_text = SortTextForArtist(item->key); item->sort_text = SortTextForArtist(item->key);
break; break;
case GroupBy_Album:
item->key = s.album();
item->display_text = TextOrUnknown(item->key);
item->sort_text = SortTextForArtist(item->key);
item->metadata.set_album_id(s.album_id());
break;
case GroupBy_YearAlbum:{ case GroupBy_YearAlbum:{
int year = qMax(0, s.year()); int year = qMax(0, s.year());
item->metadata.set_year(year); item->metadata.set_year(year);
@ -1148,26 +1158,21 @@ CollectionItem *CollectionModel::ItemFromSong(GroupBy type, bool signal, bool cr
item->sort_text = SortTextForNumber(year) + " "; item->sort_text = SortTextForNumber(year) + " ";
break; break;
} }
case GroupBy_Composer: item->key = s.composer(); case GroupBy_Composer: if (item->key.isNull()) item->key = s.composer();
case GroupBy_Performer: item->key = s.performer(); case GroupBy_Performer: if (item->key.isNull()) item->key = s.performer();
case GroupBy_Grouping: item->key = s.grouping(); case GroupBy_Grouping: if (item->key.isNull()) item->key = s.grouping();
case GroupBy_Genre: if (item->key.isNull()) item->key = s.genre(); case GroupBy_Genre: if (item->key.isNull()) item->key = s.genre();
case GroupBy_Album: if (item->key.isNull()) item->key = s.album();
case GroupBy_AlbumArtist: if (item->key.isNull()) item->key = s.effective_albumartist();
item->display_text = TextOrUnknown(item->key); item->display_text = TextOrUnknown(item->key);
item->sort_text = SortTextForArtist(item->key); item->sort_text = SortTextForArtist(item->key);
break; break;
case GroupBy_Disc: case GroupBy_Disc:
item->key = QString::number(s.disc()); item->key = QString::number(s.disc());
item->sort_text = SortTextForNumber(s.disc()); item->sort_text = SortTextForNumber(s.disc());
break; break;
case GroupBy_FileType: case GroupBy_FileType:
item->metadata.set_filetype(s.filetype()); item->metadata.set_filetype(s.filetype());
item->key = s.TextForFiletype(); item->key = s.TextForFiletype();
break; break;
case GroupBy_Bitrate:{ case GroupBy_Bitrate:{
int bitrate = qMax(0, s.bitrate()); int bitrate = qMax(0, s.bitrate());
item->key = QString::number(bitrate); item->key = QString::number(bitrate);