Improve album cover loader, lyrics search and streaming support

- Improve album cover loader
- Add album cover loader result struct
- Move album cover thumbnail scaling to album cover loader
- Make init art manual look for album cover images in song directory
- Make album cover search work for songs outside of collection and
  streams
- Make album cover search work based on artist + title if album is not
  present
- Update art manual in playlist for local files, devices and CDDA
- Make lyrics search work for streams
- Add stream dialog to menu
- Remove dead code in InternetSearchModel
- Simplify code in InternetSearchView

src/collection/collectionfilterwidget.cpp

@@ -297,6 +297,7 @@ void CollectionFilterWidget::SetCollectionModel(CollectionModel *model) {
 }
 
 void CollectionFilterWidget::GroupByClicked(QAction *action) {
+
   if (action->property("group_by").isNull()) {
     group_by_dialog_->show();
     return;
@@ -304,6 +305,7 @@ void CollectionFilterWidget::GroupByClicked(QAction *action) {
 
   CollectionModel::Grouping g = action->property("group_by").value<CollectionModel::Grouping>();
   model_->SetGroupBy(g);
+
 }
 
 void CollectionFilterWidget::GroupingChanged(const CollectionModel::Grouping &g) {

src/collection/collectionmodel.cpp

@@ -66,10 +66,9 @@
 #include "playlist/playlistmanager.h"
 #include "playlist/songmimedata.h"
 #include "covermanager/albumcoverloader.h"
+#include "covermanager/albumcoverloaderresult.h"
 #include "settings/collectionsettingspage.h"
 
-using std::bind;
-using std::sort;
 using std::placeholders::_1;
 using std::placeholders::_2;
 
@@ -116,7 +115,7 @@ CollectionModel::CollectionModel(CollectionBackend *backend, Application *app, Q
   cover_loader_options_.scale_output_image_ = true;
 
   if (app_)
-    connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QUrl, QImage)), SLOT(AlbumCoverLoaded(quint64, QUrl, QImage)));
+    connect(app_->album_cover_loader(), SIGNAL(AlbumCoverLoaded(quint64, AlbumCoverLoaderResult)), SLOT(AlbumCoverLoaded(quint64, AlbumCoverLoaderResult)));
 
   QIcon nocover = IconLoader::Load("cdcase");
   no_cover_icon_ = nocover.pixmap(nocover.availableSizes().last()).scaled(kPrettyCoverSize, kPrettyCoverSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
@@ -613,9 +612,7 @@ QVariant CollectionModel::AlbumIcon(const QModelIndex &idx) {
 
 }
 
-void CollectionModel::AlbumCoverLoaded(const quint64 id, const QUrl &cover_url, const QImage &image) {
-
-  Q_UNUSED(cover_url);
+void CollectionModel::AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result) {
 
   if (!pending_art_.contains(id)) return;
 
@@ -628,26 +625,26 @@ void CollectionModel::AlbumCoverLoaded(const quint64 id, const QUrl &cover_url,
   pending_cache_keys_.remove(cache_key);
 
   // Insert this image in the cache.
-  if (image.isNull()) {
+  if (result.image_scaled.isNull()) {
     // Set the no_cover image so we don't continually try to load art.
     QPixmapCache::insert(cache_key, no_cover_icon_);
   }
   else {
     QPixmap image_pixmap;
-    image_pixmap = QPixmap::fromImage(image);
+    image_pixmap = QPixmap::fromImage(result.image_scaled);
     QPixmapCache::insert(cache_key, image_pixmap);
   }
 
   // If we have a valid cover not already in the disk cache
   if (use_disk_cache_) {
     std::unique_ptr<QIODevice> cached_img(sIconCache->data(QUrl(cache_key)));
-    if (!cached_img && !image.isNull()) {
+    if (!cached_img && !result.image_scaled.isNull()) {
       QNetworkCacheMetaData item_metadata;
       item_metadata.setSaveToDisk(true);
       item_metadata.setUrl(QUrl(cache_key));
       QIODevice* cache = sIconCache->prepare(item_metadata);
       if (cache) {
-        image.save(cache, "XPM");
+        result.image_scaled.save(cache, "XPM");
         sIconCache->insert(cache);
       }
     }

src/collection/collectionmodel.h

@@ -44,6 +44,7 @@
 
 #include "core/simpletreemodel.h"
 #include "core/song.h"
+#include "covermanager/albumcoverloader.h"
 #include "collectionquery.h"
 #include "collectionitem.h"
 #include "sqlrow.h"
@@ -210,7 +211,7 @@ signals:
   // Called after ResetAsync
   void ResetAsyncQueryFinished(QFuture<CollectionModel::QueryResult> future);
 
-  void AlbumCoverLoaded(const quint64 id, const QUrl &cover_url, const QImage &image);
+  void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result);
 
  private:
   // Provides some optimisations for loading the list of items in the root.

src/collection/collectionplaylistitem.cpp

@@ -43,20 +43,33 @@ void CollectionPlaylistItem::Reload() {
 }
 
 bool CollectionPlaylistItem::InitFromQuery(const SqlRow &query) {
+
   // Rows from the songs tables come first
   song_.InitFromQuery(query, true);
   song_.set_source(Song::Source_Collection);
   return song_.is_valid();
+
 }
 
 QVariant CollectionPlaylistItem::DatabaseValue(DatabaseColumn column) const {
+
   switch (column) {
     case Column_CollectionId: return song_.id();
     default: return PlaylistItem::DatabaseValue(column);
   }
+
 }
 
 Song CollectionPlaylistItem::Metadata() const {
+
   if (HasTemporaryMetadata()) return temp_metadata_;
   return song_;
+
+}
+
+void CollectionPlaylistItem::SetArtManual(const QUrl &cover_url) {
+
+  song_.set_art_manual(cover_url);
+  temp_metadata_.set_art_manual(cover_url);
+
 }

src/collection/collectionplaylistitem.h

@@ -46,6 +46,8 @@ class CollectionPlaylistItem : public PlaylistItem {
 
   bool IsLocalCollectionItem() const { return true; }
 
+  void SetArtManual(const QUrl &cover_url);
+
  protected:
   QVariant DatabaseValue(DatabaseColumn column) const;
   Song DatabaseSongMetadata() const { return Song(Song::Source_Collection); }