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

Fix saving subsonic cover when ContentTypeHeader returns filetype

Browse Source
This commit is contained in:
Jonas Kvinge
2020-10-10 23:46:29 +02:00
parent 12cbcdb6f4
commit eb43a812d6
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/subsonic/subsonicrequest.cpp
View File

@@ -57,6 +57,9 @@ const int SubsonicRequest::kMaxConcurrentAlbumsRequests = 3;
const int SubsonicRequest::kMaxConcurrentAlbumSongsRequests = 3; const int SubsonicRequest::kMaxConcurrentAlbumSongsRequests = 3;
const int SubsonicRequest::kMaxConcurrentAlbumCoverRequests = 1; const int SubsonicRequest::kMaxConcurrentAlbumCoverRequests = 1;
QStringList SubsonicRequest::kSupportedImageMimeTypes;
QStringList SubsonicRequest::kSupportedImageFormats;
SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent) SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *url_handler, Application *app, QObject *parent)
: SubsonicBaseRequest(service, parent), : SubsonicBaseRequest(service, parent),
service_(service), service_(service),
@@ -78,6 +81,14 @@ SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *u
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy); network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif #endif
for (const QByteArray &mimetype : QImageReader::supportedMimeTypes()) {
kSupportedImageMimeTypes.append(QString::fromUtf8(mimetype));
}
for (const QByteArray &filetype : QImageReader::supportedImageFormats()) {
kSupportedImageFormats.append(filetype);
}
} }
SubsonicRequest::~SubsonicRequest() { SubsonicRequest::~SubsonicRequest() {
@@ -703,7 +714,7 @@ void SubsonicRequest::AddAlbumCoverRequest(Song &song) {
AlbumCoverRequest request; AlbumCoverRequest request;
request.album_id = song.album_id(); request.album_id = song.album_id();
request.url = cover_url; request.url = cover_url;
request.filename = cover_path + "/" + cover_url_query.queryItemValue("id"); request.filename = cover_path + "/" + cover_url_query.queryItemValue("id") + ".jpg";
if (request.filename.isEmpty()) return; if (request.filename.isEmpty()) return;
album_covers_requests_sent_.insert(cover_url, &song); album_covers_requests_sent_.insert(cover_url, &song);
@@ -780,39 +791,31 @@ void SubsonicRequest::AlbumCoverReceived(QNetworkReply *reply, const QUrl url, c
} }
QString mimetype = reply->header(QNetworkRequest::ContentTypeHeader).toString(); QString mimetype = reply->header(QNetworkRequest::ContentTypeHeader).toString();
if (!QImageReader::supportedMimeTypes().contains(mimetype.toUtf8())) { if (!kSupportedImageMimeTypes.contains(mimetype, Qt::CaseInsensitive) && !kSupportedImageFormats.contains(mimetype, Qt::CaseInsensitive)) {
Error(QString("Unsupported mimetype for image reader %1 for %2").arg(mimetype).arg(url.toString())); 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); if (album_covers_requests_sent_.contains(url)) album_covers_requests_sent_.remove(url);
AlbumCoverFinishCheck(); AlbumCoverFinishCheck();
return; return;
} }
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
QList<QByteArray> format_list = QImageReader::imageFormatsForMimeType(mimetype.toUtf8());
#else
QList<QByteArray> format_list = Utilities::ImageFormatsForMimeType(mimetype.toUtf8());
#endif
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
if (format_list.isEmpty() || data.isEmpty()) { if (data.isEmpty()) {
Error(QString("Received empty image data for %1").arg(url.toString())); Error(QString("Received empty image data for %1").arg(url.toString()));
if (album_covers_requests_sent_.contains(url)) album_covers_requests_sent_.remove(url); if (album_covers_requests_sent_.contains(url)) album_covers_requests_sent_.remove(url);
AlbumCoverFinishCheck(); AlbumCoverFinishCheck();
return; return;
} }
QByteArray format = format_list.first();
QString fullfilename = filename + "." + format.toLower();
QImage image; QImage image;
if (image.loadFromData(data, format)) { if (image.loadFromData(data)) {
if (image.save(fullfilename, format)) { if (image.save(filename, "JPG")) {
while (album_covers_requests_sent_.contains(url)) { while (album_covers_requests_sent_.contains(url)) {
Song *song = album_covers_requests_sent_.take(url); Song *song = album_covers_requests_sent_.take(url);
song->set_art_automatic(QUrl::fromLocalFile(fullfilename)); song->set_art_automatic(QUrl::fromLocalFile(filename));
} }
} }
else { else {
Error(QString("Error saving image data to %1.").arg(fullfilename)); Error(QString("Error saving image data to %1.").arg(filename));
if (album_covers_requests_sent_.contains(url)) album_covers_requests_sent_.remove(url); if (album_covers_requests_sent_.contains(url)) album_covers_requests_sent_.remove(url);
} }
} }

2
src/subsonic/subsonicrequest.h
View File

@@ -115,6 +115,8 @@ class SubsonicRequest : public SubsonicBaseRequest {
static const int kMaxConcurrentArtistAlbumsRequests; static const int kMaxConcurrentArtistAlbumsRequests;
static const int kMaxConcurrentAlbumSongsRequests; static const int kMaxConcurrentAlbumSongsRequests;
static const int kMaxConcurrentAlbumCoverRequests; static const int kMaxConcurrentAlbumCoverRequests;
static QStringList kSupportedImageMimeTypes;
static QStringList kSupportedImageFormats;
SubsonicService *service_; SubsonicService *service_;
SubsonicUrlHandler *url_handler_; SubsonicUrlHandler *url_handler_;