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

Rename original_url to media_url

Browse Source
This commit is contained in:
Jonas Kvinge
2023-04-21 16:20:00 +02:00
parent 3bedfb6ac8
commit bee6b7f946
26 changed files with 160 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tidal/tidalrequest.h
View File

@@ -103,7 +103,7 @@ class TidalRequest : public TidalBaseRequest {
void Results(const int id, const SongMap &songs = SongMap(), const QString &error = QString());
void UpdateStatus(const int id, const QString &text);
void UpdateProgress(const int id, const int max);
void StreamURLFinished(const QUrl &original_url, const QUrl &url, const Song::FileType filetype, const QString &error = QString());
void StreamURLFinished(const QUrl &media_url, const QUrl &url, const Song::FileType filetype, const QString &error = QString());
private slots:
void ArtistsReplyReceived(QNetworkReply *reply, const int limit_requested, const int offset_requested);

8
src/tidal/tidalservice.cpp
View File

@@ -1003,21 +1003,21 @@ uint TidalService::GetStreamURL(const QUrl &url, QString &error) {
}
void TidalService::HandleStreamURLFailure(const uint id, const QUrl &original_url, const QString &error) {
void TidalService::HandleStreamURLFailure(const uint id, const QUrl &media_url, const QString &error) {
if (!stream_url_requests_.contains(id)) return;
stream_url_requests_.remove(id);
emit StreamURLFailure(id, original_url, error);
emit StreamURLFailure(id, media_url, error);
}
void TidalService::HandleStreamURLSuccess(const uint id, const QUrl &original_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration) {
void TidalService::HandleStreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration) {
if (!stream_url_requests_.contains(id)) return;
stream_url_requests_.remove(id);
emit StreamURLSuccess(id, original_url, stream_url, filetype, samplerate, bit_depth, duration);
emit StreamURLSuccess(id, media_url, stream_url, filetype, samplerate, bit_depth, duration);
}

4
src/tidal/tidalservice.h
View File

@@ -148,8 +148,8 @@ class TidalService : public InternetService {
void ArtistsUpdateProgressReceived(const int id, const int progress);
void AlbumsUpdateProgressReceived(const int id, const int progress);
void SongsUpdateProgressReceived(const int id, const int progress);
void HandleStreamURLFailure(const uint id, const QUrl &original_url, const QString &error);
void HandleStreamURLSuccess(const uint id, const QUrl &original_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration);
void HandleStreamURLFailure(const uint id, const QUrl &media_url, const QString &error);
void HandleStreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration);
private:
using Param = QPair<QString, QString>;

38
src/tidal/tidalstreamurlrequest.cpp
View File

@@ -41,13 +41,13 @@
#include "tidalbaserequest.h"
#include "tidalstreamurlrequest.h"
TidalStreamURLRequest::TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &original_url, const uint id, QObject *parent)
TidalStreamURLRequest::TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &media_url, const uint id, QObject *parent)
: TidalBaseRequest(service, network, parent),
service_(service),
reply_(nullptr),
original_url_(original_url),
media_url_(media_url),
id_(id),
song_id_(original_url.path().toInt()),
song_id_(media_url.path().toInt()),
tries_(0),
need_login_(false) {}
@@ -67,7 +67,7 @@ void TidalStreamURLRequest::LoginComplete(const bool success, const QString &err
need_login_ = false;
if (!success) {
emit StreamURLFailure(id_, original_url_, error);
emit StreamURLFailure(id_, media_url_, error);
return;
}
@@ -79,11 +79,11 @@ void TidalStreamURLRequest::Process() {
if (!authenticated()) {
if (oauth()) {
emit StreamURLFailure(id_, original_url_, tr("Not authenticated with Tidal."));
emit StreamURLFailure(id_, media_url_, tr("Not authenticated with Tidal."));
return;
}
else if (api_token().isEmpty() || username().isEmpty() || password().isEmpty()) {
emit StreamURLFailure(id_, original_url_, tr("Missing Tidal API token, username or password."));
emit StreamURLFailure(id_, media_url_, tr("Missing Tidal API token, username or password."));
return;
}
need_login_ = true;
@@ -101,7 +101,7 @@ void TidalStreamURLRequest::Cancel() {
reply_->abort();
}
else {
emit StreamURLFailure(id_, original_url_, tr("Cancelled."));
emit StreamURLFailure(id_, media_url_, tr("Cancelled."));
}
}
@@ -158,25 +158,25 @@ void TidalStreamURLRequest::StreamURLReceived() {
need_login_ = true;
return;
}
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
QJsonObject json_obj = ExtractJsonObj(data);
if (json_obj.isEmpty()) {
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
if (!json_obj.contains("trackId")) {
Error("Invalid Json reply, stream missing trackId.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
int track_id(json_obj["trackId"].toInt());
if (track_id != song_id_) {
Error("Incorrect track ID returned.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
@@ -212,7 +212,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
json_obj = ExtractJsonObj(data_manifest);
if (json_obj.isEmpty()) {
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
@@ -221,14 +221,14 @@ void TidalStreamURLRequest::StreamURLReceived() {
QString key_id = json_obj["keyId"].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));
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
}
if (!json_obj.contains("mimeType")) {
Error("Invalid Json reply, stream url reply manifest is missing mimeType.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
@@ -251,7 +251,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
QJsonValue json_urls = json_obj["urls"];
if (!json_urls.isArray()) {
Error("Invalid Json reply, urls is not an array.", json_urls);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
QJsonArray json_array_urls = json_urls.toArray();
@@ -274,7 +274,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
QString encryption_key = json_obj["encryptionKey"].toString();
if (!encryption_key.isEmpty()) {
Error(tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams."));
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
}
@@ -284,18 +284,18 @@ void TidalStreamURLRequest::StreamURLReceived() {
QString security_token = json_obj["securityToken"].toString();
if (!security_type.isEmpty() && !security_token.isEmpty()) {
Error(tr("Received URL with encrypted stream from Tidal. Strawberry does not currently support encrypted streams."));
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
}
if (urls.isEmpty()) {
Error("Missing stream urls.", json_obj);
emit StreamURLFailure(id_, original_url_, errors_.first());
emit StreamURLFailure(id_, media_url_, errors_.first());
return;
}
emit StreamURLSuccess(id_, original_url_, urls.first(), filetype);
emit StreamURLSuccess(id_, media_url_, urls.first(), filetype);
}

10
src/tidal/tidalstreamurlrequest.h
View File

@@ -41,7 +41,7 @@ class TidalStreamURLRequest : public TidalBaseRequest {
Q_OBJECT
public:
explicit TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &original_url, const uint id, QObject *parent = nullptr);
explicit TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &media_url, const uint id, QObject *parent = nullptr);
~TidalStreamURLRequest() override;
void GetStreamURL();
@@ -50,7 +50,7 @@ class TidalStreamURLRequest : public TidalBaseRequest {
bool oauth() { return service_->oauth(); }
TidalSettingsPage::StreamUrlMethod stream_url_method() { return service_->stream_url_method(); }
QUrl original_url() { return original_url_; }
QUrl media_url() { return media_url_; }
int song_id() { return song_id_; }
void set_need_login() override { need_login_ = true; }
@@ -58,8 +58,8 @@ class TidalStreamURLRequest : public TidalBaseRequest {
signals:
void TryLogin();
void StreamURLFailure(const uint id, const QUrl &original_url, const QString &error);
void StreamURLSuccess(const uint id, const QUrl &original_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate = -1, const int bit_depth = -1, const qint64 duration = -1);
void StreamURLFailure(const uint id, const QUrl &media_url, const QString &error);
void StreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate = -1, const int bit_depth = -1, const qint64 duration = -1);
private slots:
void StreamURLReceived();
@@ -72,7 +72,7 @@ class TidalStreamURLRequest : public TidalBaseRequest {
TidalService *service_;
QNetworkReply *reply_;
QUrl original_url_;
QUrl media_url_;
uint id_;
int song_id_;
int tries_;

8
src/tidal/tidalurlhandler.cpp
View File

@@ -59,23 +59,23 @@ UrlHandler::LoadResult TidalUrlHandler::StartLoading(const QUrl &url) {
}
void TidalUrlHandler::GetStreamURLFailure(const uint id, const QUrl &original_url, const QString &error) {
void TidalUrlHandler::GetStreamURLFailure(const uint id, const QUrl &media_url, const QString &error) {
if (!requests_.contains(id)) return;
Request req = requests_.take(id);
CancelTask(req.task_id);
emit AsyncLoadComplete(LoadResult(original_url, LoadResult::Type::Error, error));
emit AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::Error, error));
}
void TidalUrlHandler::GetStreamURLSuccess(const uint id, const QUrl &original_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration) {
void TidalUrlHandler::GetStreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration) {
if (!requests_.contains(id)) return;
Request req = requests_.take(id);
CancelTask(req.task_id);
emit AsyncLoadComplete(LoadResult(original_url, LoadResult::Type::TrackAvailable, stream_url, filetype, samplerate, bit_depth, duration));
emit AsyncLoadComplete(LoadResult(media_url, LoadResult::Type::TrackAvailable, stream_url, filetype, samplerate, bit_depth, duration));
}

4
src/tidal/tidalurlhandler.h
View File

@@ -47,8 +47,8 @@ class TidalUrlHandler : public UrlHandler {
void CancelTask(const int task_id);
private slots:
void GetStreamURLFailure(const uint id, const QUrl &original_url, const QString &error);
void GetStreamURLSuccess(const uint id, const QUrl &original_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration);
void GetStreamURLFailure(const uint id, const QUrl &media_url, const QString &error);
void GetStreamURLSuccess(const uint id, const QUrl &media_url, const QUrl &stream_url, const Song::FileType filetype, const int samplerate, const int bit_depth, const qint64 duration);
private:
struct Request {