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

Use art_manual for itdb thumbnail

Browse Source
This commit is contained in:
Jonas Kvinge
2020-09-01 20:59:19 +02:00
parent f6bb7cd8ed
commit 81709873bd
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/song.cpp
View File

@@ -66,7 +66,6 @@
#include "application.h" #include "application.h"
#include "mpris_common.h" #include "mpris_common.h"
#include "collection/sqlrow.h" #include "collection/sqlrow.h"
#include "covermanager/albumcoverloader.h"
#include "tagreadermessages.pb.h" #include "tagreadermessages.pb.h"
#ifndef USE_SYSTEM_TAGLIB #ifndef USE_SYSTEM_TAGLIB
@@ -685,9 +684,10 @@ QString Song::ImageCacheDir(const Song::Source source) {
return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/tidalalbumcovers"; return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/tidalalbumcovers";
case Song::Source_Qobuz: case Song::Source_Qobuz:
return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/qobuzalbumcovers"; return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/qobuzalbumcovers";
case Song::Source_Device:
return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/devicealbumcovers";
case Song::Source_LocalFile: case Song::Source_LocalFile:
case Song::Source_CDDA: case Song::Source_CDDA:
case Song::Source_Device:
case Song::Source_Stream: case Song::Source_Stream:
case Song::Source_Unknown: case Song::Source_Unknown:
return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/albumcovers"; return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/albumcovers";
@@ -1105,17 +1105,16 @@ void Song::InitFromItdb(Itdb_Track *track, const QString &prefix) {
d->skipcount_ = track->skipcount; d->skipcount_ = track->skipcount;
d->lastplayed_ = track->time_played; d->lastplayed_ = track->time_played;
if (itdb_track_has_thumbnails(track)) { if (itdb_track_has_thumbnails(track) && !d->artist_.isEmpty() && !d->title_.isEmpty()) {
GdkPixbuf *pixbuf = static_cast<GdkPixbuf*>(itdb_track_get_thumbnail(track, -1, -1)); GdkPixbuf *pixbuf = static_cast<GdkPixbuf*>(itdb_track_get_thumbnail(track, -1, -1));
if (pixbuf) { if (pixbuf) {
gchar *buffer = nullptr; QString cover_path = ImageCacheDir(Source_Device);
gsize buffer_size = 0; QDir dir(cover_path);
if (!dir.exists()) dir.mkpath(cover_path);
QString cover_file = cover_path + "/" + Utilities::Sha1CoverHash(effective_albumartist(), effective_album()).toHex() + ".jpg";
GError *error = nullptr; GError *error = nullptr;
gdk_pixbuf_save_to_buffer(pixbuf, &buffer, &buffer_size, "jpeg", &error, nullptr); if (dir.exists() && gdk_pixbuf_save(pixbuf, cover_file.toUtf8().constData(), "jpeg", &error, nullptr)) {
if (buffer) { d->art_manual_ = QUrl::fromLocalFile(cover_file);
const QByteArray data = QByteArray::fromRawData(buffer, buffer_size);
d->image_.loadFromData(data, "JPEG");
g_free(buffer);
} }
g_object_unref(pixbuf); g_object_unref(pixbuf);
} }