Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-14 10:24:19 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4869 from paperbagcorner/albumsorting

Browse Source 
Sort discs  numerically when using Group by disc
This commit is contained in:
John Maguire 2015-05-26 21:07:15 +01:00
commit fd645b37ab
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/globalsearch/globalsearchmodel.cpp
View File

@ -115,7 +115,7 @@ QStandardItem* GlobalSearchModel::BuildContainers(const Song& s,
case LibraryModel::GroupBy_YearAlbum:
year = qMax(0, s.year());
display_text = LibraryModel::PrettyYearAlbum(year, s.album());
sort_text = LibraryModel::SortTextForYear(year) + s.album();
sort_text = LibraryModel::SortTextForNumber(year) + s.album();
unique_tag = s.album_id();
has_album_icon = true;
break;
@ -123,7 +123,7 @@ QStandardItem* GlobalSearchModel::BuildContainers(const Song& s,
case LibraryModel::GroupBy_Year:
year = qMax(0, s.year());
display_text = QString::number(year);
sort_text = LibraryModel::SortTextForYear(year) + " ";
sort_text = LibraryModel::SortTextForNumber(year) + " ";
break;
case LibraryModel::GroupBy_Composer:
@ -249,7 +249,8 @@ void GlobalSearchModel::GetChildResults(
if (is_provider) {
// Go through all the items (through the proxy to keep them ordered) and
// add the ones belonging to this provider to our list
for (int i = 0; i < proxy_->rowCount(invisibleRootItem()->index()); ++i) {
for (int i = 0; i < proxy_->rowCount(invisibleRootItem()->index());
++i) {
QModelIndex child_index =
proxy_->index(i, 0, invisibleRootItem()->index());
const QStandardItem* child_item =

46
src/library/librarymodel.cpp
View File

@ -207,7 +207,7 @@ void LibraryModel::SongsDiscovered(const SongList& songs) {
key = song.performer();
break;
case GroupBy_Disc:
key = song.disc();
key = QString::number(song.disc());
break;
case GroupBy_Grouping:
key = song.grouping();
@ -313,13 +313,13 @@ QString LibraryModel::DividerKey(GroupBy type, LibraryItem* item) const {
}
case GroupBy_Year:
return SortTextForYear(item->sort_text.toInt() / 10 * 10);
return SortTextForNumber(item->sort_text.toInt() / 10 * 10);
case GroupBy_YearAlbum:
return SortTextForYear(item->metadata.year());
return SortTextForNumber(item->metadata.year());
case GroupBy_Bitrate:
return SortTextForBitrate(item->metadata.bitrate());
return SortTextForNumber(item->metadata.bitrate());
case GroupBy_None:
return QString();
@ -904,6 +904,7 @@ LibraryItem* LibraryModel::ItemFromQuery(GroupBy type, bool signal,
LibraryItem* item = InitItem(type, signal, parent, container_level);
int year = 0;
int bitrate = 0;
int disc = 0;
switch (type) {
case GroupBy_Artist:
@ -918,18 +919,18 @@ LibraryItem* LibraryModel::ItemFromQuery(GroupBy type, bool signal,
item->metadata.set_album(row.value(1).toString());
item->metadata.set_grouping(row.value(2).toString());
item->key = PrettyYearAlbum(year, item->metadata.album());
item->sort_text = SortTextForYear(year) + item->metadata.grouping() + item->metadata.album();
item->sort_text = SortTextForNumber(year) + item->metadata.grouping() +
item->metadata.album();
break;
case GroupBy_Year:
year = qMax(0, row.value(0).toInt());
item->key = QString::number(year);
item->sort_text = SortTextForYear(year) + " ";
item->sort_text = SortTextForNumber(year) + " ";
break;
case GroupBy_Composer:
case GroupBy_Performer:
case GroupBy_Disc:
case GroupBy_Grouping:
case GroupBy_Genre:
case GroupBy_Album:
@ -939,6 +940,12 @@ LibraryItem* LibraryModel::ItemFromQuery(GroupBy type, bool signal,
item->sort_text = SortTextForArtist(item->key);
break;
case GroupBy_Disc:
disc = row.value(0).toInt();
item->key = QString::number(disc);
item->sort_text = SortTextForNumber(disc);
break;
case GroupBy_FileType:
item->metadata.set_filetype(Song::FileType(row.value(0).toInt()));
item->key = item->metadata.TextForFiletype();
@ -947,7 +954,7 @@ LibraryItem* LibraryModel::ItemFromQuery(GroupBy type, bool signal,
case GroupBy_Bitrate:
bitrate = qMax(0, row.value(0).toInt());
item->key = QString::number(bitrate);
item->sort_text = SortTextForBitrate(bitrate) + " ";
item->sort_text = SortTextForNumber(bitrate) + " ";
break;
case GroupBy_None:
@ -982,21 +989,19 @@ LibraryItem* LibraryModel::ItemFromSong(GroupBy type, bool signal,
item->metadata.set_year(year);
item->metadata.set_album(s.album());
item->key = PrettyYearAlbum(year, s.album());
item->sort_text = SortTextForYear(year) + s.grouping() + s.album();
item->sort_text = SortTextForNumber(year) + s.grouping() + s.album();
break;
case GroupBy_Year:
year = qMax(0, s.year());
item->key = QString::number(year);
item->sort_text = SortTextForYear(year) + " ";
item->sort_text = SortTextForNumber(year) + " ";
break;
case GroupBy_Composer:
item->key = s.composer();
case GroupBy_Performer:
item->key = s.performer();
case GroupBy_Disc:
item->key = s.disc();
case GroupBy_Grouping:
item->key = s.grouping();
case GroupBy_Genre:
@ -1009,6 +1014,11 @@ LibraryItem* LibraryModel::ItemFromSong(GroupBy type, bool signal,
item->sort_text = SortTextForArtist(item->key);
break;
case GroupBy_Disc:
item->key = QString::number(s.disc());
item->sort_text = SortTextForNumber(s.disc());
break;
case GroupBy_FileType:
item->metadata.set_filetype(s.filetype());
item->key = s.TextForFiletype();
@ -1017,7 +1027,7 @@ LibraryItem* LibraryModel::ItemFromSong(GroupBy type, bool signal,
case GroupBy_Bitrate:
bitrate = qMax(0, s.bitrate());
item->key = QString::number(bitrate);
item->sort_text = SortTextForBitrate(bitrate) + " ";
item->sort_text = SortTextForNumber(bitrate) + " ";
break;
case GroupBy_None:
@ -1098,14 +1108,8 @@ QString LibraryModel::SortTextForArtist(QString artist) {
return artist;
}
QString LibraryModel::SortTextForYear(int year) {
QString str = QString::number(year);
return QString("0").repeated(qMax(0, 4 - str.length())) + str;
}
QString LibraryModel::SortTextForBitrate(int bitrate) {
QString str = QString::number(bitrate);
return QString("0").repeated(qMax(0, 3 - str.length())) + str;
QString LibraryModel::SortTextForNumber(int number) {
return QString("%1").arg(number, 4, 10, QChar('0'));
}
QString LibraryModel::SortTextForSong(const Song& song) {

3
src/library/librarymodel.h
View File

@ -164,8 +164,7 @@ class LibraryModel : public SimpleTreeModel<LibraryItem> {
static QString PrettyYearAlbum(int year, const QString& album);
static QString SortText(QString text);
static QString SortTextForArtist(QString artist);
static QString SortTextForYear(int year);
static QString SortTextForBitrate(int bitrate);
static QString SortTextForNumber(int year);
static QString SortTextForSong(const Song& song);
signals: