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

130
src/tidal/tidalstreamurlrequest.cpp
View File

@@ -1,6 +1,6 @@
/*
* Strawberry Music Player
* Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
* Copyright 2018-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
@@ -62,6 +62,29 @@ TidalStreamURLRequest::~TidalStreamURLRequest() {
}
bool TidalStreamURLRequest::oauth() const {
return service_->oauth();
}
TidalSettings::StreamUrlMethod TidalStreamURLRequest::stream_url_method() const {
return service_->stream_url_method();
}
QUrl TidalStreamURLRequest::media_url() const {
return media_url_;
}
int TidalStreamURLRequest::song_id() const {
return song_id_;
}
void TidalStreamURLRequest::Process() {
if (!authenticated()) {
@@ -96,12 +119,12 @@ void TidalStreamURLRequest::GetStreamURL() {
switch (stream_url_method()) {
case TidalSettings::StreamUrlMethod::StreamUrl:
params << Param(u"soundQuality"_s, quality());
params << Param(u"soundQuality"_s, service_->quality());
reply_ = CreateRequest(QStringLiteral("tracks/%1/streamUrl").arg(song_id_), params);
QObject::connect(reply_, &QNetworkReply::finished, this, &TidalStreamURLRequest::StreamURLReceived);
break;
case TidalSettings::StreamUrlMethod::UrlPostPaywall:
params << Param(u"audioquality"_s, quality());
params << Param(u"audioquality"_s, service_->quality());
params << Param(u"playbackmode"_s, u"STREAM"_s);
params << Param(u"assetpresentation"_s, u"FULL"_s);
params << Param(u"urlusagemode"_s, u"STREAM"_s);
@@ -109,7 +132,7 @@ void TidalStreamURLRequest::GetStreamURL() {
QObject::connect(reply_, &QNetworkReply::finished, this, &TidalStreamURLRequest::StreamURLReceived);
break;
case TidalSettings::StreamUrlMethod::PlaybackInfoPostPaywall:
params << Param(u"audioquality"_s, quality());
params << Param(u"audioquality"_s, service_->quality());
params << Param(u"playbackmode"_s, u"STREAM"_s);
params << Param(u"assetpresentation"_s, u"FULL"_s);
reply_ = CreateRequest(QStringLiteral("tracks/%1/playbackinfopostpaywall").arg(song_id_), params);
@@ -123,39 +146,36 @@ void TidalStreamURLRequest::StreamURLReceived() {
if (!reply_) return;
QByteArray data = GetReplyData(reply_);
Q_ASSERT(replies_.contains(reply_));
replies_.removeAll(reply_);
const JsonObjectResult json_object_result = ParseJsonObject(reply_);
QObject::disconnect(reply_, nullptr, this, nullptr);
reply_->deleteLater();
reply_ = nullptr;
if (data.isEmpty()) {
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
if (!json_object_result.success()) {
Q_EMIT StreamURLFailure(id_, media_url_, json_object_result.error_message);
return;
}
const QJsonObject &json_object = json_object_result.json_object;
QJsonObject json_obj = ExtractJsonObj(data);
if (json_obj.isEmpty()) {
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
if (!json_object.contains("trackId"_L1)) {
Q_EMIT StreamURLFailure(id_, media_url_, u"Invalid Json reply, stream missing trackId."_s);
return;
}
if (!json_obj.contains("trackId"_L1)) {
Error(u"Invalid Json reply, stream missing trackId."_s, json_obj);
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
return;
}
int track_id = json_obj["trackId"_L1].toInt();
const int track_id = json_object["trackId"_L1].toInt();
if (track_id != song_id_) {
qLog(Debug) << "Tidal returned track ID" << track_id << "for" << media_url_;
}
Song::FileType filetype(Song::FileType::Stream);
if (json_obj.contains("codec"_L1) || json_obj.contains("codecs"_L1)) {
if (json_object.contains("codec"_L1) || json_object.contains("codecs"_L1)) {
QString codec;
if (json_obj.contains("codec"_L1)) codec = json_obj["codec"_L1].toString().toLower();
if (json_obj.contains("codecs"_L1)) codec = json_obj["codecs"_L1].toString().toLower();
if (json_object.contains("codec"_L1)) codec = json_object["codec"_L1].toString().toLower();
if (json_object.contains("codecs"_L1)) codec = json_object["codecs"_L1].toString().toLower();
filetype = Song::FiletypeByExtension(codec);
if (filetype == Song::FileType::Unknown) {
qLog(Debug) << "Tidal: Unknown codec" << codec;
@@ -165,10 +185,10 @@ void TidalStreamURLRequest::StreamURLReceived() {
QList<QUrl> urls;
if (json_obj.contains("manifest"_L1)) {
if (json_object.contains("manifest"_L1)) {
QString manifest(json_obj["manifest"_L1].toString());
QByteArray data_manifest = QByteArray::fromBase64(manifest.toUtf8());
const QString manifest(json_object["manifest"_L1].toString());
const QByteArray data_manifest = QByteArray::fromBase64(manifest.toUtf8());
QXmlStreamReader xml_reader(data_manifest);
if (xml_reader.readNextStartElement()) {
@@ -180,29 +200,28 @@ void TidalStreamURLRequest::StreamURLReceived() {
else {
json_obj = ExtractJsonObj(data_manifest);
if (json_obj.isEmpty()) {
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
const JsonObjectResult json_object_result_manifest = GetJsonObject(data_manifest);
if (!json_object_result_manifest.success()) {
Q_EMIT StreamURLFailure(id_, media_url_, json_object_result_manifest.error_message);
return;
}
const QJsonObject &object_manifest = json_object_result_manifest.json_object;
if (json_obj.contains("encryptionType"_L1) && json_obj.contains("keyId"_L1)) {
QString encryption_type = json_obj["encryptionType"_L1].toString();
QString key_id = json_obj["keyId"_L1].toString();
if (object_manifest.contains("encryptionType"_L1) && object_manifest.contains("keyId"_L1)) {
QString encryption_type = object_manifest["encryptionType"_L1].toString();
QString key_id = object_manifest["keyId"_L1].toString();
if (!encryption_type.isEmpty() && !key_id.isEmpty()) {
Error(tr("Received URL with %1 encrypted stream from Tidal. Strawberry does not currently support encrypted streams.").arg(encryption_type));
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
Q_EMIT StreamURLFailure(id_, media_url_, tr("Received URL with %1 encrypted stream from Tidal. Strawberry does not currently support encrypted streams.").arg(encryption_type));
return;
}
}
if (!json_obj.contains("mimeType"_L1)) {
Error(u"Invalid Json reply, stream url reply manifest is missing mimeType."_s, json_obj);
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
if (!object_manifest.contains("mimeType"_L1)) {
Q_EMIT StreamURLFailure(id_, media_url_, u"Invalid Json reply, stream url reply manifest is missing mimeType."_s);
return;
}
QString mimetype = json_obj["mimeType"_L1].toString();
const QString mimetype = object_manifest["mimeType"_L1].toString();
QMimeDatabase mimedb;
const QStringList suffixes = mimedb.mimeTypeForName(mimetype).suffixes();
for (const QString &suffix : suffixes) {
@@ -217,11 +236,10 @@ void TidalStreamURLRequest::StreamURLReceived() {
}
if (json_obj.contains("urls"_L1)) {
QJsonValue json_urls = json_obj["urls"_L1];
if (json_object.contains("urls"_L1)) {
const QJsonValue json_urls = json_object["urls"_L1];
if (!json_urls.isArray()) {
Error(u"Invalid Json reply, urls is not an array."_s, json_urls);
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
Q_EMIT StreamURLFailure(id_, media_url_, u"Invalid Json reply, urls is not an array."_s);
return;
}
const QJsonArray json_array_urls = json_urls.toArray();
@@ -230,8 +248,8 @@ void TidalStreamURLRequest::StreamURLReceived() {
urls << QUrl(value.toString());
}
}
else if (json_obj.contains("url"_L1)) {
QUrl new_url(json_obj["url"_L1].toString());
else if (json_object.contains("url"_L1)) {
const QUrl new_url(json_object["url"_L1].toString());
urls << new_url;
if (filetype == Song::FileType::Stream) {
// Guess filetype by filename extension in URL.
@@ -240,42 +258,28 @@ void TidalStreamURLRequest::StreamURLReceived() {
}
}
if (json_obj.contains("encryptionKey"_L1)) {
QString encryption_key = json_obj["encryptionKey"_L1].toString();
if (json_object.contains("encryptionKey"_L1)) {
const QString encryption_key = json_object["encryptionKey"_L1].toString();
if (!encryption_key.isEmpty()) {
Error(tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams."));
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
Q_EMIT StreamURLFailure(id_, media_url_, tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams."));
return;
}
}
if (json_obj.contains("securityType"_L1) && json_obj.contains("securityToken"_L1)) {
QString security_type = json_obj["securityType"_L1].toString();
QString security_token = json_obj["securityToken"_L1].toString();
if (json_object.contains("securityType"_L1) && json_object.contains("securityToken"_L1)) {
const QString security_type = json_object["securityType"_L1].toString();
const QString security_token = json_object["securityToken"_L1].toString();
if (!security_type.isEmpty() && !security_token.isEmpty()) {
Error(tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams."));
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
Q_EMIT StreamURLFailure(id_, media_url_, tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams."));
return;
}
}
if (urls.isEmpty()) {
Error(u"Missing stream urls."_s, json_obj);
Q_EMIT StreamURLFailure(id_, media_url_, errors_.constFirst());
Q_EMIT StreamURLFailure(id_, media_url_, u"Missing stream urls."_s);
return;
}
Q_EMIT StreamURLSuccess(id_, media_url_, urls.first(), filetype);
}
void TidalStreamURLRequest::Error(const QString &error, const QVariant &debug) {
qLog(Error) << "Tidal:" << error;
if (debug.isValid()) qLog(Debug) << debug;
if (!error.isEmpty()) {
errors_ << error;
}
}