Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

lyrics: Use lambda for UltimateLyricsProvider requests 

Remove map of requests to ids and pass info directly to reply handler.
This commit is contained in:
Jim Broadus 2020-05-23 22:33:59 -07:00 committed by John Maguire
parent 40575e854e
commit 02a1fc9a07
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/songinfo/ultimatelyricsprovider.cpp
View File

@ -55,18 +55,11 @@ void UltimateLyricsProvider::FetchInfo(int id, const Song& metadata) {
metadata_ = metadata; metadata_ = metadata;
redirect_count_ = 0; redirect_count_ = 0;
QNetworkReply* reply = network_->get(QNetworkRequest(url)); QNetworkReply* reply = network_->get(QNetworkRequest(url));
requests_[reply] = id; connect(reply, &QNetworkReply::finished,
connect(reply, SIGNAL(finished()), SLOT(LyricsFetched())); [=] { this->RequestFinished(reply, id); });
} }
void UltimateLyricsProvider::LyricsFetched() { void UltimateLyricsProvider::RequestFinished(QNetworkReply* reply, int id) {
QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
if (!reply) {
url_hop_ = false;
return;
}
int id = requests_.take(reply);
reply->deleteLater(); reply->deleteLater();
if (reply->error() != QNetworkReply::NoError) { if (reply->error() != QNetworkReply::NoError) {
@ -94,8 +87,8 @@ void UltimateLyricsProvider::LyricsFetched() {
redirect_count_++; redirect_count_++;
QNetworkReply* reply = network_->get(QNetworkRequest(target)); QNetworkReply* reply = network_->get(QNetworkRequest(target));
requests_[reply] = id; connect(reply, &QNetworkReply::finished,
connect(reply, SIGNAL(finished()), SLOT(LyricsFetched())); [=] { this->RequestFinished(reply, id); });
return; return;
} }
@ -129,8 +122,8 @@ void UltimateLyricsProvider::LyricsFetched() {
QUrl url(content); QUrl url(content);
qLog(Debug) << "Next url hop: " << url; qLog(Debug) << "Next url hop: " << url;
QNetworkReply* reply = network_->get(QNetworkRequest(url)); QNetworkReply* reply = network_->get(QNetworkRequest(url));
requests_[reply] = id; connect(reply, &QNetworkReply::finished,
connect(reply, SIGNAL(finished()), SLOT(LyricsFetched())); [=] { this->RequestFinished(reply, id); });
return; return;
} }

3
src/songinfo/ultimatelyricsprovider.h
View File

@ -62,7 +62,7 @@ class UltimateLyricsProvider : public SongInfoProvider {
void FetchInfo(int id, const Song& metadata); void FetchInfo(int id, const Song& metadata);
private slots: private slots:
void LyricsFetched(); void RequestFinished(QNetworkReply* reply, int id);
private: private:
bool ApplyExtractRule(const Rule& rule, QString* content) const; bool ApplyExtractRule(const Rule& rule, QString* content) const;
@ -86,7 +86,6 @@ class UltimateLyricsProvider : public SongInfoProvider {
private: private:
NetworkAccessManager* network_; NetworkAccessManager* network_;
QMap<QNetworkReply*, int> requests_;
QString name_; QString name_;
QString title_; QString title_;