Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Follow redirects in subsonic

This commit is contained in:
Jonas Kvinge 2019-08-20 23:32:20 +02:00
parent 9c485c4d94
commit 4359f2a0ce
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/subsonic/subsonicbaserequest.cpp
View File

@ -46,8 +46,13 @@
SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *parent) : SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *parent) :
QObject(parent), QObject(parent),
service_(service), service_(service),
network_(new QNetworkAccessManager) network_(new QNetworkAccessManager) {
{}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
}
SubsonicBaseRequest::~SubsonicBaseRequest() {} SubsonicBaseRequest::~SubsonicBaseRequest() {}
@ -123,6 +128,7 @@ QByteArray SubsonicBaseRequest::GetReplyData(QNetworkReply *reply) {
Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error())); Error(QString("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
} }
else { else {
// See if there is Json data containing "error" - then use that instead. // See if there is Json data containing "error" - then use that instead.
data = reply->readAll(); data = reply->readAll();
QString error; QString error;

8
src/subsonic/subsonicrequest.cpp
View File

@ -65,7 +65,13 @@ SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *u
album_covers_requested_(0), album_covers_requested_(0),
album_covers_received_(0), album_covers_received_(0),
no_results_(false) no_results_(false)
{} {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
}
SubsonicRequest::~SubsonicRequest() { SubsonicRequest::~SubsonicRequest() {