Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-31 01:29:41 +01:00
Code Issues Releases Wiki Activity

Fix search error not shown in Tidal search

Browse Source
This commit is contained in:
Jonas Kvinge 2018-09-15 22:34:44 +02:00
parent 8e35e0c476
commit ab5d9b62b8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tidal/tidalservice.cpp
View File

@ -229,7 +229,7 @@ void TidalService::HandleAuthReply(QNetworkReply *reply, int search_id) {
} }
if ( !json_obj.contains("userId") || !json_obj.contains("sessionId") || !json_obj.contains("countryCode") ) { if ( !json_obj.contains("userId") || !json_obj.contains("sessionId") || !json_obj.contains("countryCode") ) {
QString failure_reason = tr("Authentication reply from server is missing userId, sessionId or countryCode"); QString failure_reason("Authentication reply from server is missing userId, sessionId or countryCode");
if (search_id != 0) Error(failure_reason); if (search_id != 0) Error(failure_reason);
emit LoginFailure(failure_reason); emit LoginFailure(failure_reason);
return; return;
@ -846,8 +846,13 @@ void TidalService::GetStreamURLFinished(QNetworkReply *reply, const int search_i
void TidalService::CheckFinish() { void TidalService::CheckFinish() {
if (search_id_ == 0) return;
if (!login_sent_ && albums_requested_ <= albums_received_ && songs_requested_ <= songs_received_) { if (!login_sent_ && albums_requested_ <= albums_received_ && songs_requested_ <= songs_received_) {
if (songs_.isEmpty()) emit SearchError(search_id_, search_error_); if (songs_.isEmpty()) {
if (search_error_.isEmpty()) emit SearchError(search_id_, "Unknown error");
else emit SearchError(search_id_, search_error_);
}
else emit SearchResults(search_id_, songs_); else emit SearchResults(search_id_, songs_);
ClearSearch(); ClearSearch();
} }

2
src/tidal/tidalservice.h
View File

@ -93,7 +93,7 @@ class TidalService : public InternetService {
Song ParseSong(const int album_id_requested, const QJsonValue &value); Song ParseSong(const int album_id_requested, const QJsonValue &value);
void GetStreamURL(const int album_id, const int song_id); void GetStreamURL(const int album_id, const int song_id);
void CheckFinish(); void CheckFinish();
void Error(QString error, QString debug = ""); void Error(QString error, QString debug = QString());
static const char *kApiUrl; static const char *kApiUrl;
static const char *kAuthUrl; static const char *kAuthUrl;