Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll back to the cache naming conventions for covers (#5651)

Browse Source
This commit is contained in:
Santiago Gil 2017-03-07 08:46:54 -03:00 committed by John Maguire
parent 99ad5dcd2d
commit 62bc647cbc
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/ui/albumcoverchoicecontroller.cpp
View File

@ -123,7 +123,9 @@ QString AlbumCoverChoiceController::LoadCoverFromFile(Song* song) {
void AlbumCoverChoiceController::SaveCoverToFile(const Song& song,
const QImage& image) {
QString initial_file_name =
"/" + (song.album().isEmpty() ? tr("Unknown") : song.album()) + ".jpg";
"/" + (song.effective_album().isEmpty() ? tr("Unknown")
: song.effective_album()) +
".jpg";
QString save_filename = QFileDialog::getSaveFileName(
this, tr("Save album cover"),
@ -168,8 +170,7 @@ QString AlbumCoverChoiceController::LoadCoverFromURL(Song* song) {
QImage image = cover_from_url_dialog_->Exec();
if (!image.isNull()) {
QString cover =
SaveCoverInCache(song->effective_albumartist(), song->album(), image);
QString cover = SaveCoverInCache(song->artist(), song->album(), image);
SaveCover(song, cover);
return cover;
@ -179,13 +180,14 @@ QString AlbumCoverChoiceController::LoadCoverFromURL(Song* song) {
}
QString AlbumCoverChoiceController::SearchForCover(Song* song) {
// Get something sensible to stick in the search box
// Get something sensible to stick in the search box.
// We search for the 'effective' values, but we cache the covers with the
// Song's artist() and album().
QImage image = cover_searcher_->Exec(song->effective_albumartist(),
song->effective_album());
if (!image.isNull()) {
QString cover = SaveCoverInCache(song->effective_albumartist(),
song->effective_album(), image);
QString cover = SaveCoverInCache(song->artist(), song->album(), image);
SaveCover(song, cover);
return cover;
@ -205,11 +207,10 @@ void AlbumCoverChoiceController::ShowCover(const Song& song) {
QDialog* dialog = new QDialog(this);
dialog->setAttribute(Qt::WA_DeleteOnClose, true);
// Use Artist - Album as the window title
QString title_text(song.albumartist());
if (title_text.isEmpty()) title_text = song.effective_albumartist();
if (!song.album().isEmpty()) title_text += " - " + song.album();
// Use (Album)Artist - Album as the window title
QString title_text(song.effective_albumartist());
if (!song.effective_album().isEmpty())
title_text += " - " + song.effective_album();
QLabel* label = new QLabel(dialog);
label->setPixmap(AlbumCoverLoader::TryLoadPixmap(
@ -260,8 +261,7 @@ void AlbumCoverChoiceController::AlbumCoverFetched(
}
if (!image.isNull()) {
QString cover =
SaveCoverInCache(song.effective_albumartist(), song.album(), image);
QString cover = SaveCoverInCache(song.artist(), song.album(), image);
SaveCover(&song, cover);
}
@ -341,7 +341,7 @@ QString AlbumCoverChoiceController::SaveCover(Song* song, const QDropEvent* e) {
QImage image = qvariant_cast<QImage>(e->mimeData()->imageData());
if (!image.isNull()) {
QString cover_path =
SaveCoverInCache(song->effective_albumartist(), song->album(), image);
SaveCoverInCache(song->artist(), song->album(), image);
SaveCover(song, cover_path);
return cover_path;
}

4
src/ui/albumcovermanager.cpp
View File

@ -753,8 +753,8 @@ void AlbumCoverManager::SaveAndSetCover(QListWidgetItem* item,
const QString albumartist = item->data(Role_ArtistName).toString();
const QString album = item->data(Role_AlbumName).toString();
QString path = album_cover_choice_controller_->SaveCoverInCache(
EffectiveAlbumArtistName(*item), album, image);
QString path =
album_cover_choice_controller_->SaveCoverInCache(artist, album, image);
// Save the image in the database
library_backend_->UpdateManualAlbumArtAsync(artist, albumartist, album, path);