Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-16 02:35:27 +01:00
Code Issues Releases Wiki Activity

Use original file when loading cover from file in album cover manager

Browse Source
This commit is contained in:
Jonas Kvinge 2021-03-16 17:18:11 +01:00
parent 5eda028af3
commit a7df2bc4fb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/covermanager/albumcovermanager.cpp
View File

@ -778,11 +778,13 @@ void AlbumCoverManager::SearchForCover() {
void AlbumCoverManager::SaveImageToAlbums(Song *song, const AlbumCoverImageResult &result) { void AlbumCoverManager::SaveImageToAlbums(Song *song, const AlbumCoverImageResult &result) {
QUrl cover_url; QUrl cover_url = result.cover_url;
switch (album_cover_choice_controller_->get_save_album_cover_type()) { switch (album_cover_choice_controller_->get_save_album_cover_type()) {
case CollectionSettingsPage::SaveCoverType_Cache: case CollectionSettingsPage::SaveCoverType_Cache:
case CollectionSettingsPage::SaveCoverType_Album: case CollectionSettingsPage::SaveCoverType_Album:
cover_url = album_cover_choice_controller_->SaveCoverToFileAutomatic(song, result); if (cover_url.isEmpty() || !cover_url.isValid() || !cover_url.isLocalFile()) {
cover_url = album_cover_choice_controller_->SaveCoverToFileAutomatic(song, result);
}
break; break;
case CollectionSettingsPage::SaveCoverType_Embedded: case CollectionSettingsPage::SaveCoverType_Embedded:
cover_url = QUrl::fromLocalFile(Song::kEmbeddedCover); cover_url = QUrl::fromLocalFile(Song::kEmbeddedCover);
@ -981,12 +983,12 @@ void AlbumCoverManager::SaveAndSetCover(AlbumItem *item, const AlbumCoverImageRe
} }
else { else {
QUrl cover_url; QUrl cover_url;
if (!result.image_data.isNull() || !result.image.isNull()) { if (!result.cover_url.isEmpty() && result.cover_url.isValid() && result.cover_url.isLocalFile()) {
cover_url = album_cover_choice_controller_->SaveCoverToFileAutomatic(Song::Source_Collection, albumartist, album, QString(), urls.first().adjusted(QUrl::RemoveFilename).path(), result, false);
}
else if (!result.cover_url.isEmpty() && !result.cover_url.isLocalFile()) {
cover_url = result.cover_url; cover_url = result.cover_url;
} }
else if (!result.image_data.isEmpty() || !result.image.isNull()) {
cover_url = album_cover_choice_controller_->SaveCoverToFileAutomatic(Song::Source_Collection, albumartist, album, QString(), urls.first().adjusted(QUrl::RemoveFilename).path(), result, false);
}
if (cover_url.isEmpty()) return; if (cover_url.isEmpty()) return;