dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename sort functions

Browse Source
This commit is contained in:
Jonas Kvinge
2025-08-12 22:14:22 +02:00
parent f8afd49fcf
commit f3d088e48b
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/collection/collectionmodel.cpp
View File

@@ -1073,7 +1073,7 @@ QString CollectionModel::SortText(const GroupBy group_by, const Song &song, cons
switch (group_by) {
case GroupBy::AlbumArtist:
return SortTextForName(song.effective_albumartist_with_sort(), sort_skip_articles_for_artists);
return SortTextForName(song.effective_albumartistsort(), sort_skip_articles_for_artists);
case GroupBy::Artist:
return SortTextForName(song.effective_artistsort(), sort_skip_articles_for_artists);
case GroupBy::Album:

6
src/core/song.cpp
View File

@@ -664,15 +664,15 @@ void Song::set_initial_key(const TagLib::String &v) { d->initial_key_ = TagLibSt
const QUrl &Song::effective_url() const { return !d->stream_url_.isEmpty() && d->stream_url_.isValid() ? d->stream_url_ : d->url_; }
const QString &Song::effective_titlesort() const { return d->titlesort_.isEmpty() ? d->title_ : d->titlesort_; }
const QString &Song::effective_albumartist() const { return d->albumartist_.isEmpty() ? d->artist_ : d->albumartist_; }
const QString &Song::effective_albumartistsort_only() const { return d->albumartistsort_.isEmpty() ? d->albumartist_ : d->albumartistsort_; }
const QString &Song::effective_albumartist_with_sort() const { return effective_albumartistsort_only().isEmpty() ? effective_artistsort() : effective_albumartistsort_only(); }
const QString &Song::effective_albumartistsort() const { return !d->albumartistsort_.isEmpty() ? d->albumartistsort_ : !d->albumartist_.isEmpty() ? d->albumartist_ : effective_artistsort(); }
const QString &Song::effective_artistsort() const { return d->artistsort_.isEmpty() ? d->artist_ : d->artistsort_; }
const QString &Song::effective_album() const { return d->album_.isEmpty() ? d->title_ : d->album_; }
const QString &Song::effective_albumsort() const { return d->albumsort_.isEmpty() ? d->album_ : d->albumsort_; }
const QString &Song::effective_composersort() const { return d->composersort_.isEmpty() ? d->composer_ : d->composersort_; }
const QString &Song::effective_performersort() const { return d->performersort_.isEmpty() ? d->performer_ : d->performersort_; }
int Song::effective_originalyear() const { return d->originalyear_ < 0 ? d->year_ : d->originalyear_; }
const QString &Song::playlist_albumartist() const { return is_compilation() ? effective_albumartistsort_only() : effective_albumartist_with_sort(); }
const QString &Song::playlist_effective_albumartist() const { return is_compilation() ? d->albumartist_ : effective_albumartist(); }
const QString &Song::playlist_effective_albumartistsort() const { return is_compilation() ? (!d->albumartistsort_.isEmpty() ? d->albumartistsort_ : d->albumartist_) : effective_albumartistsort(); }
bool Song::is_metadata_good() const { return !d->url_.isEmpty() && !d->artist_.isEmpty() && !d->title_.isEmpty(); }
bool Song::is_local_collection_song() const { return d->source_ == Source::Collection; }

6
src/core/song.h
View File

@@ -390,15 +390,15 @@ class Song {
const QUrl &effective_url() const;
const QString &effective_titlesort() const;
const QString &effective_albumartist() const;
const QString &effective_albumartistsort_only() const;
const QString &effective_albumartist_with_sort() const;
const QString &effective_albumartistsort() const;
const QString &effective_artistsort() const;
const QString &effective_album() const;
const QString &effective_albumsort() const;
const QString &effective_composersort() const;
const QString &effective_performersort() const;
int effective_originalyear() const;
const QString &playlist_albumartist() const;
const QString &playlist_effective_albumartist() const;
const QString &playlist_effective_albumartistsort() const;
bool is_metadata_good() const;
bool is_local_collection_song() const;

4
src/playlist/playlist.cpp
View File

@@ -354,7 +354,7 @@ QVariant Playlist::data(const QModelIndex &idx, const int role) const {
case Column::Year: return song.year();
case Column::OriginalYear: return song.effective_originalyear();
case Column::Genre: return song.genre();
case Column::AlbumArtist: return song.playlist_albumartist();
case Column::AlbumArtist: return song.playlist_effective_albumartist();
case Column::AlbumArtistSort: return song.albumartistsort();
case Column::Composer: return song.composer();
case Column::ComposerSort: return song.composersort();
@@ -1384,7 +1384,7 @@ bool Playlist::CompareItems(const Column column, const Qt::SortOrder order, Play
case Column::Year: return CompareVal(ma.year(), mb.year());
case Column::OriginalYear: return CompareVal(ma.effective_originalyear(), mb.effective_originalyear());
case Column::Genre: return CompareStr(ma.genre(), mb.genre());
case Column::AlbumArtist: return CompareStr(ma.playlist_albumartist(), mb.playlist_albumartist());
case Column::AlbumArtist: return CompareStr(ma.playlist_effective_albumartistsort(), mb.playlist_effective_albumartistsort());
case Column::AlbumArtistSort: return CompareStr(ma.albumartistsort(), mb.albumartistsort());
case Column::Composer: return CompareStr(ma.effective_composersort(), mb.effective_composersort());
case Column::ComposerSort: return CompareStr(ma.composersort(), mb.composersort());

2
src/streaming/streamingsearchmodel.cpp
View File

@@ -97,7 +97,7 @@ QStandardItem *StreamingSearchModel::BuildContainers(const Song &s, QStandardIte
}
else {
display_text = CollectionModel::TextOrUnknown(s.effective_albumartist());
sort_text = CollectionModel::SortTextForName(s.effective_albumartist_with_sort(), true);
sort_text = CollectionModel::SortTextForName(s.effective_albumartistsort(), true);
}
has_artist_icon = true;
break;