Improve album cover searching and cover manager, use HttpStatusCodeAttribute and QSslError for services

- Improve album cover manager
- Change art_automatic and art_manual to QUrl
- Refresh collection album covers when new album covers are fetched
- Fix automatic album cover searching for local files outside of the collection
- Make all Json services check HttpStatusCodeAttribute
- Show detailed SSL errors for Subsonic, Tidal and Qobuz

src/context/contextalbumsmodel.cpp

@@ -81,7 +81,7 @@ ContextAlbumsModel::ContextAlbumsModel(CollectionBackend *backend, Application *
   cover_loader_options_.pad_output_image_ = true;
   cover_loader_options_.scale_output_image_ = true;
 
-  connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QImage)), SLOT(AlbumArtLoaded(quint64, QImage)));
+  connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QUrl, QImage)), SLOT(AlbumCoverLoaded(quint64, QUrl, QImage)));
 
   QIcon nocover = IconLoader::Load("cdcase");
   no_cover_icon_ = nocover.pixmap(nocover.availableSizes().last()).scaled(kPrettyCoverSize, kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -165,14 +165,16 @@ QVariant ContextAlbumsModel::AlbumIcon(const QModelIndex &index) {
 
 }
 
-void ContextAlbumsModel::AlbumArtLoaded(quint64 id, const QImage &image) {
+void ContextAlbumsModel::AlbumCoverLoaded(const quint64 id, const QUrl &cover_url, const QImage &image) {
+
+  if (!pending_art_.contains(id)) return;
 
   ItemAndCacheKey item_and_cache_key = pending_art_.take(id);
-  CollectionItem *item = item_and_cache_key.first;
-  const QString &cache_key = item_and_cache_key.second;
 
+  CollectionItem *item = item_and_cache_key.first;
   if (!item) return;
 
+  const QString &cache_key = item_and_cache_key.second;
   pending_cache_keys_.remove(cache_key);
 
   // Insert this image in the cache.
@@ -181,7 +183,6 @@ void ContextAlbumsModel::AlbumArtLoaded(quint64 id, const QImage &image) {
     QPixmapCache::insert(cache_key, no_cover_icon_);
   }
   else {
-    //qLog(Debug) << cache_key;
     QPixmap image_pixmap;
     image_pixmap = QPixmap::fromImage(image);
     QPixmapCache::insert(cache_key, image_pixmap);

src/context/contextalbumsmodel.h

@@ -109,7 +109,7 @@ class ContextAlbumsModel : public SimpleTreeModel<CollectionItem> {
   void LazyPopulate(CollectionItem *item, bool signal);
 
  private slots:
-  void AlbumArtLoaded(quint64 id, const QImage &image);
+  void AlbumCoverLoaded(const quint64 id, const QUrl &cover_url, const QImage &image);
 
  private:
   QueryResult RunQuery(CollectionItem *parent);

src/context/contextview.cpp

@@ -60,7 +60,7 @@
 #include "collection/collectionview.h"
 #include "covermanager/albumcoverchoicecontroller.h"
 #include "covermanager/albumcoverloader.h"
-#include "covermanager/currentartloader.h"
+#include "covermanager/currentalbumcoverloader.h"
 #include "lyrics/lyricsfetcher.h"
 
 #include "contextview.h"
@@ -117,9 +117,7 @@ void ContextView::Init(Application *app, CollectionView *collectionview, AlbumCo
   connect(collectionview_, SIGNAL(TotalArtistCountUpdated_()), this, SLOT(UpdateNoSong()));
   connect(collectionview_, SIGNAL(TotalAlbumCountUpdated_()), this, SLOT(UpdateNoSong()));
   connect(lyrics_fetcher_, SIGNAL(LyricsFetched(const quint64, const QString&, const QString&)), this, SLOT(UpdateLyrics(const quint64, const QString&, const QString&)));
-  connect(app_->current_art_loader(), SIGNAL(ArtLoaded(Song, QString, QImage)), SLOT(AlbumArtLoaded(Song, QString, QImage)));
   connect(album_cover_choice_controller_, SIGNAL(AutomaticCoverSearchDone()), this, SLOT(AutomaticCoverSearchDone()));
-  connect(album_cover_choice_controller_->search_cover_auto_action(), SIGNAL(triggered()), this, SLOT(SearchCoverAutomatically()));
 
   AddActions();
 
@@ -595,7 +593,7 @@ void ContextView::ScaleCover() {
 
 }
 
-void ContextView::AlbumArtLoaded(const Song &song, const QString&, const QImage &image) {
+void ContextView::AlbumCoverLoaded(const Song &song, const QUrl &cover_url, const QImage &image) {
 
   if (song.id() != song_playing_.id() || song.url() != song_playing_.url()) return;
   if (song.effective_albumartist() != song_playing_.effective_albumartist() || song.effective_album() != song_playing_.effective_album() || song.title() != song_playing_.title()) return;
@@ -605,7 +603,6 @@ void ContextView::AlbumArtLoaded(const Song &song, const QString&, const QImage
   downloading_covers_ = false;
   song_ = song;
   SetImage(image);
-  GetCoverAutomatically();
 
 }
 
@@ -634,28 +631,15 @@ void ContextView::SetImage(const QImage &image) {
 
 }
 
-void ContextView::GetCoverAutomatically() {
+void ContextView::SearchCoverInProgress() {
 
-  // Search for cover automatically?
-  bool search =
-               album_cover_choice_controller_->search_cover_auto_action()->isChecked() &&
-               !song_.has_manually_unset_cover() &&
-               song_.art_automatic().isEmpty() &&
-               song_.art_manual().isEmpty() &&
-               !song_.effective_albumartist().isEmpty() &&
-               !song_.effective_album().isEmpty();
+  downloading_covers_ = true;
 
-  if (search) {
-    downloading_covers_ = true;
-    // This is done in mainwindow instead to avoid searching multiple times (ContextView & PlayingWidget)
-    //album_cover_choice_controller_->SearchCoverAutomatically(song_);
-
-    // Show a spinner animation
-    spinner_animation_.reset(new QMovie(":/pictures/spinner.gif", QByteArray(), this));
-    connect(spinner_animation_.get(), SIGNAL(updated(const QRect&)), SLOT(update()));
-    spinner_animation_->start();
-    update();
-  }
+  // Show a spinner animation
+  spinner_animation_.reset(new QMovie(":/pictures/spinner.gif", QByteArray(), this));
+  connect(spinner_animation_.get(), SIGNAL(updated(const QRect&)), SLOT(update()));
+  spinner_animation_->start();
+  update();
 
 }
 
@@ -703,7 +687,3 @@ void ContextView::ActionShowLyrics() {
     lyrics_id_ = lyrics_fetcher_->Search(song_.artist(), song_.album(), song_.title());
   }
 }
-
-void ContextView::SearchCoverAutomatically() {
-  GetCoverAutomatically();
-}

src/context/contextview.h

@@ -131,9 +131,9 @@ class ContextView : public QWidget {
   void ActionShowAlbums();
   void ActionShowLyrics();
   void UpdateLyrics(const quint64 id, const QString &provider, const QString &lyrics);
-  void SearchCoverAutomatically();
+  void SearchCoverInProgress();
   void AutomaticCoverSearchDone();
-  void AlbumArtLoaded(const Song &song, const QString &uri, const QImage &image);
+  void AlbumCoverLoaded(const Song &song, const QUrl &cover_url, const QImage &image);
   void FadePreviousTrack(qreal value);
 
 };