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

Fix error message from url handler

Browse Source
This commit is contained in:
Jonas Kvinge
2019-07-28 14:58:34 +02:00
parent 8e9c9802d1
commit 08dee6bb4f
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qobuz/qobuzstreamurlrequest.cpp
View File

@@ -67,7 +67,7 @@ void QobuzStreamURLRequest::LoginComplete(bool success, QString error) {
need_login_ = false; need_login_ = false;
if (!success) { if (!success) {
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
@@ -157,33 +157,33 @@ void QobuzStreamURLRequest::StreamURLReceived() {
need_login_ = true; need_login_ = true;
return; return;
} }
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
reply_ = nullptr; reply_ = nullptr;
QJsonObject json_obj = ExtractJsonObj(data); QJsonObject json_obj = ExtractJsonObj(data);
if (json_obj.isEmpty()) { if (json_obj.isEmpty()) {
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
if (!json_obj.contains("track_id")) { if (!json_obj.contains("track_id")) {
Error("Invalid Json reply, stream url is missing track_id.", json_obj); Error("Invalid Json reply, stream url is missing track_id.", json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
int track_id = json_obj["track_id"].toInt(); int track_id = json_obj["track_id"].toInt();
if (track_id != song_id_) { if (track_id != song_id_) {
Error("Incorrect track ID returned.", json_obj); Error("Incorrect track ID returned.", json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
if (!json_obj.contains("mime_type") || !json_obj.contains("url")) { if (!json_obj.contains("mime_type") || !json_obj.contains("url")) {
Error("Invalid Json reply, stream url is missing url or mime_type.", json_obj); Error("Invalid Json reply, stream url is missing url or mime_type.", json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
@@ -203,7 +203,7 @@ void QobuzStreamURLRequest::StreamURLReceived() {
if (!url.isValid()) { if (!url.isValid()) {
Error("Returned stream url is invalid.", json_obj); Error("Returned stream url is invalid.", json_obj);
emit StreamURLFinished(original_url_, original_url_, filetype, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, filetype, -1, -1, -1, errors_.first());
return; return;
} }

20
src/tidal/tidalstreamurlrequest.cpp
View File

@@ -154,7 +154,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
need_login_ = true; need_login_ = true;
return; return;
} }
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
reply_ = nullptr; reply_ = nullptr;
@@ -163,19 +163,19 @@ void TidalStreamURLRequest::StreamURLReceived() {
QJsonObject json_obj = ExtractJsonObj(data); QJsonObject json_obj = ExtractJsonObj(data);
if (json_obj.isEmpty()) { if (json_obj.isEmpty()) {
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
if (!json_obj.contains("trackId")) { if (!json_obj.contains("trackId")) {
Error("Invalid Json reply, stream missing trackId.", json_obj); Error("Invalid Json reply, stream missing trackId.", json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
int track_id(json_obj["trackId"].toInt()); int track_id(json_obj["trackId"].toInt());
if (track_id != song_id_) { if (track_id != song_id_) {
Error("Incorrect track ID returned.", json_obj); Error("Incorrect track ID returned.", json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
@@ -208,7 +208,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
QString filename = "tidal-" + QString::number(song_id_) + ".xml"; QString filename = "tidal-" + QString::number(song_id_) + ".xml";
if (!QDir().mkpath(filepath)) { if (!QDir().mkpath(filepath)) {
Error(QString("Failed to create directory %1.").arg(filepath), json_obj); Error(QString("Failed to create directory %1.").arg(filepath), json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
QUrl url("file://" + filepath + "/" + filename); QUrl url("file://" + filepath + "/" + filename);
@@ -217,7 +217,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
file.remove(); file.remove();
if (!file.open(QIODevice::WriteOnly)) { if (!file.open(QIODevice::WriteOnly)) {
Error(QString("Failed to open file %1 for writing.").arg(url.toLocalFile()), json_obj); Error(QString("Failed to open file %1 for writing.").arg(url.toLocalFile()), json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
file.write(data_manifest); file.write(data_manifest);
@@ -231,13 +231,13 @@ void TidalStreamURLRequest::StreamURLReceived() {
json_obj = ExtractJsonObj(data_manifest); json_obj = ExtractJsonObj(data_manifest);
if (json_obj.isEmpty()) { if (json_obj.isEmpty()) {
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
if (!json_obj.contains("mimeType")) { if (!json_obj.contains("mimeType")) {
Error("Invalid Json reply, stream url reply manifest is missing mimeType.", json_obj); Error("Invalid Json reply, stream url reply manifest is missing mimeType.", json_obj);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
@@ -259,7 +259,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
QJsonValue json_urls = json_obj["urls"]; QJsonValue json_urls = json_obj["urls"];
if (!json_urls.isArray()) { if (!json_urls.isArray()) {
Error("Invalid Json reply, urls is not an array.", json_urls); Error("Invalid Json reply, urls is not an array.", json_urls);
emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, Song::FileType_Stream, -1, -1, -1, errors_.first());
return; return;
} }
QJsonArray json_array_urls = json_urls.toArray(); QJsonArray json_array_urls = json_urls.toArray();
@@ -274,7 +274,7 @@ void TidalStreamURLRequest::StreamURLReceived() {
if (urls.isEmpty()) { if (urls.isEmpty()) {
Error("Missing stream urls.", json_obj); Error("Missing stream urls.", json_obj);
emit StreamURLFinished(original_url_, original_url_, filetype, -1, -1, -1, ErrorsToHTML(errors_)); emit StreamURLFinished(original_url_, original_url_, filetype, -1, -1, -1, errors_.first());
return; return;
} }