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

Check if QNetworkRequest::ContentTypeHeader is filetype everwhere

Browse Source
This commit is contained in:
Jonas Kvinge
2020-10-11 01:08:42 +02:00
parent db96e24028
commit 318c3bb422
7 changed files with 66 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/subsonic/subsonicrequest.cpp
View File

@@ -57,9 +57,6 @@ const int SubsonicRequest::kMaxConcurrentAlbumsRequests = 3;
const int SubsonicRequest::kMaxConcurrentAlbumSongsRequests = 3;
const int SubsonicRequest::kMaxConcurrentAlbumCoverRequests = 1;
QStringList SubsonicRequest::kSupportedImageMimeTypes;
QStringList SubsonicRequest::kSupportedImageFormats;
SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent)
: SubsonicBaseRequest(service, parent),
service_(service),
@@ -81,14 +78,6 @@ SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *u
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
for (const QByteArray &mimetype : QImageReader::supportedMimeTypes()) {
kSupportedImageMimeTypes.append(QString::fromUtf8(mimetype));
}
for (const QByteArray &filetype : QImageReader::supportedImageFormats()) {
kSupportedImageFormats.append(filetype);
}
}
SubsonicRequest::~SubsonicRequest() {
@@ -799,7 +788,7 @@ void SubsonicRequest::AlbumCoverReceived(QNetworkReply *reply, const QUrl url, c
}
QString mimetype = reply->header(QNetworkRequest::ContentTypeHeader).toString();
if (!kSupportedImageMimeTypes.contains(mimetype, Qt::CaseInsensitive) && !kSupportedImageFormats.contains(mimetype, Qt::CaseInsensitive)) {
if (!Utilities::SupportedImageMimeTypes().contains(mimetype, Qt::CaseInsensitive) && !Utilities::SupportedImageFormats().contains(mimetype, Qt::CaseInsensitive)) {
Error(QString("Unsupported mimetype for image reader %1 for %2").arg(mimetype).arg(url.toString()));
if (album_covers_requests_sent_.contains(url)) album_covers_requests_sent_.remove(url);
AlbumCoverFinishCheck();