Add Qobuz album cover provider

src/CMakeLists.txt

@@ -227,6 +227,7 @@ set(SOURCES
   covermanager/musicbrainzcoverprovider.cpp
   covermanager/discogscoverprovider.cpp
   covermanager/deezercoverprovider.cpp
+  covermanager/qobuzcoverprovider.cpp
 
   lyrics/lyricsproviders.cpp
   lyrics/lyricsprovider.cpp
@@ -413,6 +414,7 @@ set(HEADERS
   covermanager/musicbrainzcoverprovider.h
   covermanager/discogscoverprovider.h
   covermanager/deezercoverprovider.h
+  covermanager/qobuzcoverprovider.h
 
   lyrics/lyricsproviders.h
   lyrics/lyricsprovider.h

src/core/application.cpp

@@ -56,6 +56,7 @@
 #include "covermanager/discogscoverprovider.h"
 #include "covermanager/musicbrainzcoverprovider.h"
 #include "covermanager/deezercoverprovider.h"
+#include "covermanager/qobuzcoverprovider.h"
 
 #include "lyrics/lyricsproviders.h"
 #include "lyrics/auddlyricsprovider.h"
@@ -116,6 +117,7 @@ class ApplicationImpl {
           cover_providers->AddProvider(new DiscogsCoverProvider(app, app));
           cover_providers->AddProvider(new MusicbrainzCoverProvider(app, app));
           cover_providers->AddProvider(new DeezerCoverProvider(app, app));
+          cover_providers->AddProvider(new QobuzCoverProvider(app, app));
 #ifdef HAVE_TIDAL
           cover_providers->AddProvider(new TidalCoverProvider(app, app));
 #endif

src/covermanager/qobuzcoverprovider.cpp

@@ -0,0 +1,300 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "config.h"
+
+#include <algorithm>
+
+#include <QtGlobal>
+#include <QObject>
+#include <QPair>
+#include <QList>
+#include <QVariant>
+#include <QByteArray>
+#include <QString>
+#include <QUrl>
+#include <QUrlQuery>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonValue>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QtDebug>
+
+#include "core/application.h"
+#include "core/network.h"
+#include "core/logging.h"
+#include "core/song.h"
+#include "albumcoverfetcher.h"
+#include "qobuzcoverprovider.h"
+
+const char *QobuzCoverProvider::kApiUrl = "https://www.qobuz.com/api.json/0.2";
+const char *QobuzCoverProvider::kAppID = "OTQyODUyNTY3";
+const int QobuzCoverProvider::kLimit = 10;
+
+QobuzCoverProvider::QobuzCoverProvider(Application *app, QObject *parent) : CoverProvider("Qobuz", 2.0, true, true, app, parent), network_(new NetworkAccessManager(this)) {}
+
+bool QobuzCoverProvider::StartSearch(const QString &artist, const QString &album, const QString &title, const int id) {
+
+  typedef QPair<QString, QString> Param;
+  typedef QList<Param> ParamList;
+
+  QString request;
+  QString search;
+  if (album.isEmpty()) {
+    request = "track/search";
+    search = artist + " " + title;
+  }
+  else {
+    request = "album/search";
+    search = artist + " " + album;
+  }
+
+  ParamList params = ParamList() << Param("query", search)
+                                 << Param("limit", QString::number(kLimit))
+                                 << Param("app_id", QString::fromUtf8(QByteArray::fromBase64(kAppID)));
+
+  std::sort(params.begin(), params.end());
+
+  QUrlQuery url_query;
+  for (const Param &param : params) {
+    url_query.addQueryItem(QUrl::toPercentEncoding(param.first), QUrl::toPercentEncoding(param.second));
+  }
+
+  QUrl url(kApiUrl + QString("/") + request);
+  url.setQuery(url_query);
+
+  QNetworkRequest req(url);
+  req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+  req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+  req.setRawHeader("X-App-Id", kAppID);
+  QNetworkReply *reply = network_->get(req);
+  connect(reply, &QNetworkReply::finished, [=] { this->HandleSearchReply(reply, id); });
+
+  qLog(Debug) << "Qobuz: Sending request" << url;
+
+  return true;
+
+}
+
+void QobuzCoverProvider::CancelSearch(int id) { Q_UNUSED(id); }
+
+QByteArray QobuzCoverProvider::GetReplyData(QNetworkReply *reply) {
+
+  QByteArray data;
+
+  if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) {
+    data = reply->readAll();
+  }
+  else {
+    if (reply->error() != QNetworkReply::NoError && reply->error() < 200) {
+      // This is a network error, there is nothing more to do.
+      Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
+    }
+    else {
+      // See if there is Json data containing "status", "code" and "message" - then use that instead.
+      data = reply->readAll();
+      QString error;
+      QJsonParseError parse_error;
+      QJsonDocument json_doc = QJsonDocument::fromJson(data, &parse_error);
+      if (parse_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) {
+        QJsonObject json_obj = json_doc.object();
+        if (!json_obj.isEmpty() && json_obj.contains("status") && json_obj.contains("code") && json_obj.contains("message")) {
+          QString status = json_obj["status"].toString();
+          int code = json_obj["code"].toInt();
+          QString message = json_obj["message"].toString();
+          error = QString("%1 (%2)").arg(message).arg(code);
+        }
+      }
+      if (error.isEmpty()) {
+        if (reply->error() != QNetworkReply::NoError) {
+          error = QString("%1 (%2)").arg(reply->errorString()).arg(reply->error());
+        }
+        else {
+          error = QString("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
+        }
+      }
+      Error(error);
+    }
+    return QByteArray();
+  }
+
+  return data;
+
+}
+
+QJsonObject QobuzCoverProvider::ExtractJsonObj(const QByteArray &data) {
+
+  QJsonParseError json_error;
+  QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
+
+  if (json_error.error != QJsonParseError::NoError) {
+    Error("Reply from server missing Json data.", data);
+    return QJsonObject();
+  }
+
+  if (json_doc.isEmpty()) {
+    Error("Received empty Json document.", data);
+    return QJsonObject();
+  }
+
+  if (!json_doc.isObject()) {
+    Error("Json document is not an object.", json_doc);
+    return QJsonObject();
+  }
+
+  QJsonObject json_obj = json_doc.object();
+  if (json_obj.isEmpty()) {
+    Error("Received empty Json object.", json_doc);
+    return QJsonObject();
+  }
+
+  return json_obj;
+
+}
+
+void QobuzCoverProvider::HandleSearchReply(QNetworkReply *reply, const int id) {
+
+  reply->deleteLater();
+
+  CoverSearchResults results;
+
+  QByteArray data = GetReplyData(reply);
+  if (data.isEmpty()) {
+    emit SearchFinished(id, results);
+    return;
+  }
+
+  QJsonObject json_obj = ExtractJsonObj(data);
+  if (json_obj.isEmpty()) {
+    emit SearchFinished(id, results);
+    return;
+  }
+
+  QJsonValue json_type;
+  if (json_obj.contains("albums")) {
+    json_type = json_obj["albums"];
+  }
+  else if (json_obj.contains("tracks")) {
+    json_type = json_obj["tracks"];
+  }
+  else {
+    Error("Json reply is missing albums and tracks object.", json_obj);
+    emit SearchFinished(id, results);
+    return;
+  }
+
+  if (!json_type.isObject()) {
+    Error("Json albums or tracks is not a object.", json_type);
+    emit SearchFinished(id, results);
+    return;
+  }
+  QJsonObject obj_type = json_type.toObject();
+
+  if (!obj_type.contains("items")) {
+    Error("Json albums or tracks object does not contain items.", obj_type);
+    emit SearchFinished(id, results);
+    return;
+  }
+  QJsonValue json_items = obj_type["items"];
+
+  if (!json_items.isArray()) {
+    Error("Json albums or track object items is not a array.", json_items);
+    emit SearchFinished(id, results);
+    return;
+  }
+  QJsonArray json_array = json_items.toArray();
+
+  for (const QJsonValue &value : json_array) {
+
+    if (!value.isObject()) {
+      Error("Invalid Json reply, value in items is not a object.", value);
+      continue;
+    }
+    json_obj = value.toObject();
+
+    QJsonObject obj_album;
+    if (json_obj.contains("album")) {
+      if (!json_obj["album"].isObject()) {
+        Error("Invalid Json reply, items album is not a object.", json_obj);
+        continue;
+      }
+      obj_album = json_obj["album"].toObject();
+    }
+    else {
+      obj_album = json_obj;
+    }
+
+    if (!obj_album.contains("artist") || !obj_album.contains("image") || !obj_album.contains("title")) {
+      Error("Invalid Json reply, item is missing artist, title or image.", json_obj);
+      continue;
+    }
+
+    QString album = obj_album["title"].toString();
+
+    // Artist
+    QJsonValue json_artist = obj_album["artist"];
+    if (!json_artist.isObject()) {
+      Error("Invalid Json reply, items (album) artist is not a object.", json_artist);
+      continue;
+    }
+    QJsonObject obj_artist = json_artist.toObject();
+    if (!obj_artist.contains("name")) {
+      Error("Invalid Json reply, items (album) artist is missing name.", obj_artist);
+      continue;
+    }
+    QString artist = json_artist["name"].toString();
+
+    // Image
+    QJsonValue json_image = obj_album["image"];
+    if (!json_image.isObject()) {
+      Error("Invalid Json reply, items (album) image is not a object.", json_image);
+      continue;
+    }
+    QJsonObject obj_image = json_image.toObject();
+    if (!obj_image.contains("large")) {
+      Error("Invalid Json reply, items (album) image is missing large.", obj_image);
+      continue;
+    }
+    QUrl cover_url(obj_image["large"].toString());
+
+    album.remove(Song::kAlbumRemoveDisc);
+    album.remove(Song::kAlbumRemoveMisc);
+
+    CoverSearchResult cover_result;
+    cover_result.artist = artist;
+    cover_result.album = album;
+    cover_result.image_url = cover_url;
+    results << cover_result;
+
+    qLog(Debug) << artist << album << cover_url;
+
+  }
+  emit SearchFinished(id, results);
+
+}
+
+void QobuzCoverProvider::Error(const QString &error, const QVariant &debug) {
+
+  qLog(Error) << "Qobuz:" << error;
+  if (debug.isValid()) qLog(Debug) << debug;
+
+}

src/covermanager/qobuzcoverprovider.h

@@ -0,0 +1,62 @@
+/*
+ * Strawberry Music Player
+ * Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
+ *
+ * Strawberry is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Strawberry is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef QOBUZCOVERPROVIDER_H
+#define QOBUZCOVERPROVIDER_H
+
+#include "config.h"
+
+#include <QObject>
+#include <QVariant>
+#include <QByteArray>
+#include <QString>
+#include <QJsonObject>
+
+#include "coverprovider.h"
+
+class QNetworkAccessManager;
+class QNetworkReply;
+class Application;
+
+class QobuzCoverProvider : public CoverProvider {
+  Q_OBJECT
+
+ public:
+  explicit QobuzCoverProvider(Application *app, QObject *parent = nullptr);
+  bool StartSearch(const QString &artist, const QString &album, const QString &title, const int id);
+  void CancelSearch(int id);
+
+ private slots:
+  void HandleSearchReply(QNetworkReply *reply, const int id);
+
+ private:
+  QByteArray GetReplyData(QNetworkReply *reply);
+  QJsonObject ExtractJsonObj(const QByteArray &data);
+  void Error(const QString &error, const QVariant &debug = QVariant());
+
+ private:
+  static const char *kApiUrl;
+  static const char *kAppID;
+  static const int kLimit;
+
+  QNetworkAccessManager *network_;
+
+};
+
+#endif  // QOBUZCOVERPROVIDER_H