dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Tidal, Spotify, Qobuz, Subsonic and cover providers

Browse Source 
Use common HTTP, Json and OAuthenticator class
This commit is contained in:
Jonas Kvinge
2025-03-08 23:11:07 +01:00
parent 7de8a44709
commit cd516c37b9
81 changed files with 2429 additions and 3968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/covermanager/musixmatchcoverprovider.cpp
View File

@@ -1,6 +1,6 @@
/*
* Strawberry Music Player
* Copyright 2020-2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2020-2025, 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
@@ -19,20 +19,20 @@
#include "config.h"
#include <QObject>
#include <QByteArray>
#include <QVariant>
#include <QString>
#include <QUrl>
#include <QUrlQuery>
#include <QRegularExpression>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QJsonDocument>
#include <QJsonParseError>
#include <QJsonObject>
#include <QScopeGuard>
#include "includes/shared_ptr.h"
#include "utilities/musixmatchprovider.h"
#include "core/logging.h"
#include "core/networkaccessmanager.h"
#include "albumcoverfetcher.h"
@@ -40,37 +40,23 @@
#include "musixmatchcoverprovider.h"
using namespace Qt::Literals::StringLiterals;
using namespace MusixmatchProvider;
MusixmatchCoverProvider::MusixmatchCoverProvider(const SharedPtr<NetworkAccessManager> network, QObject *parent)
: JsonCoverProvider(u"Musixmatch"_s, true, false, 1.0, true, false, network, parent) {}
MusixmatchCoverProvider::~MusixmatchCoverProvider() {
while (!replies_.isEmpty()) {
QNetworkReply *reply = replies_.takeFirst();
QObject::disconnect(reply, nullptr, this, nullptr);
reply->abort();
reply->deleteLater();
}
}
bool MusixmatchCoverProvider::StartSearch(const QString &artist, const QString &album, const QString &title, const int id) {
Q_UNUSED(title);
if (artist.isEmpty() || album.isEmpty()) return false;
QString artist_stripped = StringFixup(artist);
QString album_stripped = StringFixup(album);
const QString artist_stripped = StringFixup(artist);
const QString album_stripped = StringFixup(album);
if (artist_stripped.isEmpty() || album_stripped.isEmpty()) return false;
QUrl url(QStringLiteral("https://www.musixmatch.com/album/%1/%2").arg(artist_stripped, album_stripped));
QNetworkRequest req(url);
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
QNetworkReply *reply = network_->get(req);
replies_ << reply;
QNetworkReply *reply = CreateGetRequest(QUrl(QStringLiteral("https://www.musixmatch.com/album/%1/%2").arg(artist_stripped, album_stripped)));
QObject::connect(reply, &QNetworkReply::finished, this, [this, reply, id, artist, album]() { HandleSearchReply(reply, id, artist, album); });
//qLog(Debug) << "Musixmatch: Sending request for" << artist_stripped << album_stripped << url;
@@ -89,29 +75,19 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int
reply->deleteLater();
CoverProviderSearchResults results;
const QScopeGuard search_finished = qScopeGuard([this, id, &results]() { Q_EMIT SearchFinished(id, results);; });
if (reply->error() != QNetworkReply::NoError) {
Error(QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
Q_EMIT SearchFinished(id, results);
return;
}
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() != 200) {
Error(QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()));
Q_EMIT SearchFinished(id, results);
const ReplyDataResult reply_data_result = GetReplyData(reply);
if (!reply_data_result.success()) {
Error(reply_data_result.error_message);
return;
}
const QByteArray data = reply->readAll();
if (data.isEmpty()) {
Error(u"Empty reply received from server."_s);
Q_EMIT SearchFinished(id, results);
return;
}
const QByteArray &data = reply_data_result.data;
const QString content = QString::fromUtf8(data);
const QString data_begin = "<script id=\"__NEXT_DATA__\" type=\"application/json\">"_L1;
const QString data_end = "</script>"_L1;
if (!content.contains(data_begin) || !content.contains(data_end)) {
Q_EMIT SearchFinished(id, results);
return;
}
qint64 begin_idx = content.indexOf(data_begin);
@@ -125,89 +101,61 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int
}
if (content_json.isEmpty()) {
Q_EMIT SearchFinished(id, results);
return;
}
static const QRegularExpression regex_html_tag(u"<[^>]*>"_s);
if (content_json.contains(regex_html_tag)) { // Make sure it's not HTML code.
Q_EMIT SearchFinished(id, results);
return;
}
QJsonParseError error;
QJsonDocument json_doc = QJsonDocument::fromJson(content_json.toUtf8(), &error);
if (error.error != QJsonParseError::NoError) {
Error(QStringLiteral("Failed to parse json data: %1").arg(error.errorString()));
Q_EMIT SearchFinished(id, results);
const JsonObjectResult json_object_result = GetJsonObject(content_json.toUtf8());
if (!json_object_result.success()) {
Error(json_object_result.error_message);
return;
}
if (json_doc.isEmpty()) {
Error(u"Received empty Json document."_s, data);
Q_EMIT SearchFinished(id, results);
QJsonObject json_object = json_object_result.json_object;
if (!json_object.contains("props"_L1) || !json_object["props"_L1].isObject()) {
Error(u"Json reply is missing props."_s, json_object);
return;
}
json_object = json_object["props"_L1].toObject();
if (!json_doc.isObject()) {
Error(u"Json document is not an object."_s, json_doc);
if (!json_object.contains("pageProps"_L1) || !json_object["pageProps"_L1].isObject()) {
Error(u"Json props is missing pageProps."_s, json_object);
Q_EMIT SearchFinished(id, results);
return;
}
json_object = json_object["pageProps"_L1].toObject();
QJsonObject obj_data = json_doc.object();
if (obj_data.isEmpty()) {
Error(u"Received empty Json object."_s, json_doc);
Q_EMIT SearchFinished(id, results);
if (!json_object.contains("data"_L1) || !json_object["data"_L1].isObject()) {
Error(u"Json pageProps is missing data."_s, json_object);
return;
}
json_object = json_object["data"_L1].toObject();
if (!obj_data.contains("props"_L1) || !obj_data["props"_L1].isObject()) {
Error(u"Json reply is missing props."_s, obj_data);
Q_EMIT SearchFinished(id, results);
if (!json_object.contains("albumGet"_L1) || !json_object["albumGet"_L1].isObject()) {
Error(u"Json data is missing albumGet."_s, json_object);
return;
}
obj_data = obj_data["props"_L1].toObject();
json_object = json_object["albumGet"_L1].toObject();
if (!obj_data.contains("pageProps"_L1) || !obj_data["pageProps"_L1].isObject()) {
Error(u"Json props is missing pageProps."_s, obj_data);
Q_EMIT SearchFinished(id, results);
if (!json_object.contains("data"_L1) || !json_object["data"_L1].isObject()) {
Error(u"Json albumGet reply is missing data."_s, json_object);
return;
}
obj_data = obj_data["pageProps"_L1].toObject();
if (!obj_data.contains("data"_L1) || !obj_data["data"_L1].isObject()) {
Error(u"Json pageProps is missing data."_s, obj_data);
Q_EMIT SearchFinished(id, results);
return;
}
obj_data = obj_data["data"_L1].toObject();
if (!obj_data.contains("albumGet"_L1) || !obj_data["albumGet"_L1].isObject()) {
Error(u"Json data is missing albumGet."_s, obj_data);
Q_EMIT SearchFinished(id, results);
return;
}
obj_data = obj_data["albumGet"_L1].toObject();
if (!obj_data.contains("data"_L1) || !obj_data["data"_L1].isObject()) {
Error(u"Json albumGet reply is missing data."_s, obj_data);
Q_EMIT SearchFinished(id, results);
return;
}
obj_data = obj_data["data"_L1].toObject();
json_object = json_object["data"_L1].toObject();
CoverProviderSearchResult result;
if (obj_data.contains("artistName"_L1) && obj_data["artistName"_L1].isString()) {
result.artist = obj_data["artistName"_L1].toString();
if (json_object.contains("artistName"_L1) && json_object["artistName"_L1].isString()) {
result.artist = json_object["artistName"_L1].toString();
}
if (obj_data.contains("name"_L1) && obj_data["name"_L1].isString()) {
result.album = obj_data["name"_L1].toString();
if (json_object.contains("name"_L1) && json_object["name"_L1].isString()) {
result.album = json_object["name"_L1].toString();
}
if (result.artist.compare(artist, Qt::CaseInsensitive) != 0 && result.album.compare(album, Qt::CaseInsensitive) != 0) {
Q_EMIT SearchFinished(id, results);
return;
}
@@ -216,8 +164,8 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int
<< qMakePair(u"coverImage350x350"_s, QSize(350, 350));
for (const QPair<QString, QSize> &cover_size : cover_sizes) {
if (!obj_data.contains(cover_size.first)) continue;
QUrl cover_url(obj_data[cover_size.first].toString());
if (!json_object.contains(cover_size.first)) continue;
const QUrl cover_url(json_object[cover_size.first].toString());
if (cover_url.isValid()) {
result.image_url = cover_url;
result.image_size = cover_size.second;
@@ -225,8 +173,6 @@ void MusixmatchCoverProvider::HandleSearchReply(QNetworkReply *reply, const int
}
}
Q_EMIT SearchFinished(id, results);
}
void MusixmatchCoverProvider::Error(const QString &error, const QVariant &debug) {