Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactor EffectiveAlbumArtistName()

This commit is contained in:
santigl 2017-03-06 15:41:29 -03:00 committed by John Maguire
parent 426118a4dc
commit 99ad5dcd2d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui/albumcovermanager.cpp
View File

@ -331,7 +331,7 @@ void AlbumCoverManager::ArtistChanged(QListWidgetItem* current) {
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled |
Qt::ItemIsDragEnabled);
QString effective_artist = EffectiveAlbumArtistName(item);
QString effective_artist = EffectiveAlbumArtistName(*item);
if (!artist.isEmpty()) {
item->setToolTip(effective_artist + " - " + info.album_name);
} else {
@ -430,7 +430,7 @@ void AlbumCoverManager::FetchAlbumCovers() {
if (ItemHasCover(*item)) continue;
quint64 id = cover_fetcher_->FetchAlbumCover(
EffectiveAlbumArtistName(item), item->data(Role_AlbumName).toString());
EffectiveAlbumArtistName(*item), item->data(Role_AlbumName).toString());
cover_fetching_tasks_[id] = item;
jobs_++;
}
@ -533,7 +533,7 @@ Song AlbumCoverManager::ItemAsSong(QListWidgetItem* item) {
Song result;
QString title = item->data(Role_AlbumName).toString();
QString artist_name = EffectiveAlbumArtistName(item);
QString artist_name = EffectiveAlbumArtistName(*item);
if (!artist_name.isEmpty()) {
result.set_title(artist_name + " - " + title);
} else {
@ -566,7 +566,7 @@ void AlbumCoverManager::ShowCover() {
void AlbumCoverManager::FetchSingleCover() {
for (QListWidgetItem* item : context_menu_items_) {
quint64 id = cover_fetcher_->FetchAlbumCover(
EffectiveAlbumArtistName(item), item->data(Role_AlbumName).toString());
EffectiveAlbumArtistName(*item), item->data(Role_AlbumName).toString());
cover_fetching_tasks_[id] = item;
jobs_++;
}
@ -754,7 +754,7 @@ void AlbumCoverManager::SaveAndSetCover(QListWidgetItem* item,
const QString album = item->data(Role_AlbumName).toString();
QString path = album_cover_choice_controller_->SaveCoverInCache(
EffectiveAlbumArtistName(item), album, image);
EffectiveAlbumArtistName(*item), album, image);
// Save the image in the database
library_backend_->UpdateManualAlbumArtAsync(artist, albumartist, album, path);
@ -827,11 +827,12 @@ void AlbumCoverManager::UpdateExportStatus(int exported, int skipped, int max) {
}
QString AlbumCoverManager::EffectiveAlbumArtistName(
const QListWidgetItem* item) const {
if (!item->data(Role_AlbumArtistName).toString().isEmpty()) {
return item->data(Role_AlbumArtistName).toString();
const QListWidgetItem& item) const {
QString albumartist = item.data(Role_AlbumArtistName).toString();
if (!albumartist.isEmpty()) {
return albumartist;
}
return item->data(Role_ArtistName).toString();
return item.data(Role_ArtistName).toString();
}
QImage AlbumCoverManager::GenerateNoCoverImage(

2
src/ui/albumcovermanager.h
View File

@ -130,7 +130,7 @@ signals:
QString InitialPathForOpenCoverDialog(const QString& path_automatic,
const QString& first_file_name) const;
QString EffectiveAlbumArtistName(const QListWidgetItem* item) const;
QString EffectiveAlbumArtistName(const QListWidgetItem& item) const;
// Returns the selected element in form of a Song ready to be used
// by AlbumCoverChoiceController or invalid song if there's nothing