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

TidalRequest: Simplify no results

Browse Source 
Fixes #1047
This commit is contained in:
Jonas Kvinge
2022-10-09 22:07:59 +02:00
parent 143f72cf6b
commit f1e3ac65ac
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tidal/tidalrequest.cpp
View File

@@ -75,8 +75,7 @@ TidalRequest::TidalRequest(TidalService *service, TidalUrlHandler *url_handler,
album_covers_requests_active_(), album_covers_requests_active_(),
album_covers_requested_(0), album_covers_requested_(0),
album_covers_received_(0), album_covers_received_(0),
need_login_(false), need_login_(false) {}
no_results_(false) {}
TidalRequest::~TidalRequest() { TidalRequest::~TidalRequest() {
@@ -388,7 +387,6 @@ void TidalRequest::ArtistsReplyReceived(QNetworkReply *reply, const int limit_re
QJsonArray array_items = value_items.toArray(); QJsonArray array_items = value_items.toArray();
if (array_items.isEmpty()) { // Empty array means no results if (array_items.isEmpty()) { // Empty array means no results
if (offset_requested == 0) no_results_ = true;
ArtistsFinishCheck(); ArtistsFinishCheck();
return; return;
} }
@@ -564,9 +562,6 @@ void TidalRequest::AlbumsReceived(QNetworkReply *reply, const QString &artist_id
} }
QJsonArray array_items = value_items.toArray(); QJsonArray array_items = value_items.toArray();
if (array_items.isEmpty()) { if (array_items.isEmpty()) {
if ((type_ == QueryType_Albums || type_ == QueryType_SearchAlbums || (type_ == QueryType_SearchSongs && fetchalbums_)) && offset_requested == 0) {
no_results_ = true;
}
AlbumsFinishCheck(artist_id_requested); AlbumsFinishCheck(artist_id_requested);
return; return;
} }
@@ -847,9 +842,6 @@ void TidalRequest::SongsReceived(QNetworkReply *reply, const QString &artist_id,
QJsonArray json_items = json_value.toArray(); QJsonArray json_items = json_value.toArray();
if (json_items.isEmpty()) { if (json_items.isEmpty()) {
if ((type_ == QueryType_Songs || type_ == QueryType_SearchSongs) && offset_requested == 0) {
no_results_ = true;
}
SongsFinishCheck(artist_id, album_id, limit_requested, offset_requested, songs_total, 0, album_artist, album, album_explicit); SongsFinishCheck(artist_id, album_id, limit_requested, offset_requested, songs_total, 0, album_artist, album, album_explicit);
return; return;
} }
@@ -1262,20 +1254,22 @@ void TidalRequest::FinishCheck() {
album_covers_received_ >= album_covers_requested_ album_covers_received_ >= album_covers_requested_
) { ) {
finished_ = true; finished_ = true;
if (no_results_ && songs_.isEmpty()) { if (errors_.isEmpty()) {
if (IsSearch()) if (songs_.isEmpty()) {
emit Results(query_id_, SongMap(), tr("No match.")); if (IsSearch()) {
else emit Results(query_id_, SongMap(), tr("No match."));
emit Results(query_id_, SongMap(), QString()); }
} else {
else { emit Results(query_id_, SongMap(), QString());
if (songs_.isEmpty() && errors_.isEmpty()) { }
emit Results(query_id_, songs_, tr("Unknown error"));
} }
else { else {
emit Results(query_id_, songs_, ErrorsToHTML(errors_)); emit Results(query_id_, songs_, QString());
} }
} }
else {
emit Results(query_id_, SongMap(), ErrorsToHTML(errors_));
}
} }
} }

1
src/tidal/tidalrequest.h
View File

@@ -202,7 +202,6 @@ class TidalRequest : public TidalBaseRequest {
SongMap songs_; SongMap songs_;
QStringList errors_; QStringList errors_;
bool need_login_; bool need_login_;
bool no_results_;
QList<QNetworkReply*> replies_; QList<QNetworkReply*> replies_;
QList<QNetworkReply*> album_cover_replies_; QList<QNetworkReply*> album_cover_replies_;