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

SubsonicRequest: Make sure covers are only requested once per cover ID

Browse Source 
Fixes #885
This commit is contained in:
Jonas Kvinge
2022-01-30 02:30:51 +01:00
parent 609413cda4
commit 78adc388df
2 changed files with 61 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/subsonic/subsonicrequest.h
View File

@@ -61,19 +61,7 @@ class SubsonicRequest : public SubsonicBaseRequest {
void GetAlbums();
void Reset();
signals:
void Results(SongMap songs, QString error);
void UpdateStatus(QString text);
void ProgressSetMaximum(int max);
void UpdateProgress(int max);
private slots:
void AlbumsReplyReceived(QNetworkReply *reply, const int offset_requested, const int size_requested);
void AlbumSongsReplyReceived(QNetworkReply *reply, const QString &artist_id, const QString &album_id, const QString &album_artist);
void AlbumCoverReceived(QNetworkReply *reply, const QUrl &url, const QString &filename);
private:
private:
struct Request {
explicit Request() : offset(0), size(0) {}
QString artist_id;
@@ -86,10 +74,24 @@ class SubsonicRequest : public SubsonicBaseRequest {
struct AlbumCoverRequest {
QString artist_id;
QString album_id;
QString cover_id;
QUrl url;
QString filename;
};
signals:
void Results(SongMap songs, QString error);
void UpdateStatus(QString text);
void ProgressSetMaximum(int max);
void UpdateProgress(int max);
private slots:
void AlbumsReplyReceived(QNetworkReply *reply, const int offset_requested, const int size_requested);
void AlbumSongsReplyReceived(QNetworkReply *reply, const QString &artist_id, const QString &album_id, const QString &album_artist);
void AlbumCoverReceived(QNetworkReply *reply, const AlbumCoverRequest &request);
private:
void AddAlbumsRequest(const int offset = 0, const int size = 500);
void FlushAlbumsRequests();
@@ -128,7 +130,7 @@ class SubsonicRequest : public SubsonicBaseRequest {
QQueue<AlbumCoverRequest> album_cover_requests_queue_;
QHash<QString, Request> album_songs_requests_pending_;
QMultiMap<QUrl, QString> album_covers_requests_sent_;
QMultiMap<QString, QString> album_covers_requests_sent_;
int albums_requests_active_;
@@ -141,6 +143,7 @@ class SubsonicRequest : public SubsonicBaseRequest {
int album_covers_received_;
SongMap songs_;
QMap<QString, QUrl> cover_urls_;
QStringList errors_;
bool no_results_;
QList<QNetworkReply*> replies_;