diff options
| -rw-r--r-- | core/imagedownloader.cpp | 12 | ||||
| -rw-r--r-- | qt-models/divepicturemodel.cpp | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/imagedownloader.cpp b/core/imagedownloader.cpp index fe0bf138a..aaab9a434 100644 --- a/core/imagedownloader.cpp +++ b/core/imagedownloader.cpp @@ -44,6 +44,7 @@ bool ImageDownloader::loadFromUrl(const QUrl &url) connect(&manager, &QNetworkAccessManager::finished, this, [this,&success] (QNetworkReply *reply) { saveImage(reply, success); }); connect(&manager, &QNetworkAccessManager::finished, &loop, &QEventLoop::quit); + qDebug() << "Downloading image from" << url; QNetworkReply *reply = manager.get(request); loop.exec(); delete reply; @@ -68,6 +69,7 @@ void ImageDownloader::saveImage(QNetworkReply *reply, bool &success) dir.mkpath(path); QFile imageFile(path.append("/").append(hash.result().toHex())); if (imageFile.open(QIODevice::WriteOnly)) { + qDebug() << "Write image to" << imageFile.fileName(); QDataStream stream(&imageFile); stream.writeRawData(imageData.data(), imageData.length()); imageFile.waitForBytesWritten(-1); @@ -103,12 +105,18 @@ static void loadPicture(struct picture *picture, bool fromHash) SHashedImage::SHashedImage(struct picture *picture) : QImage() { QUrl url = QUrl::fromUserInput(localFilePath(QString(picture->filename))); - if(url.isLocalFile()) + if (url.isLocalFile()) { load(url.toLocalFile()); + if (isNull()) + qInfo() << "Failed loading picture" << url.toLocalFile(); + else + qDebug() << "Loaded picture" << url.toLocalFile(); + } if (isNull()) { // This did not load anything. Let's try to get the image from other sources // Let's try to load it locally via its hash QString filename = localFilePath(picture->filename); + qDebug() << QStringLiteral("Translated filename: %1 -> %2").arg(picture->filename, filename); if (filename.isNull()) { // That didn't produce a local filename. // Try the cloud server @@ -119,9 +127,11 @@ SHashedImage::SHashedImage(struct picture *picture) : QImage() load(filename); if (!isNull()) { // Make sure the hash still matches the image file + qDebug() << "Loaded picture from translated filename" << filename; QtConcurrent::run(hashPicture, clone_picture(picture)); } else { // Interpret filename as URL + qInfo() << "Failed loading picture from translated filename" << filename; QtConcurrent::run(loadPicture, clone_picture(picture), false); } } diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index 6cb8cae07..804e2013f 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -23,6 +23,7 @@ static void scaleImages(PictureEntry &entry, int size, int maxSize) // If thumbnails were written by an earlier version, they might be smaller than needed. // Rescale in such a case to avoid resizing artifacts. if (thumbnail.isNull() || (thumbnail.size().width() < maxSize && thumbnail.size().height() < maxSize)) { + qDebug() << "No thumbnail in cache for" << entry.filename; thumbnail = SHashedImage(entry.picture).scaled(maxSize, maxSize, Qt::KeepAspectRatio); QMutexLocker l(&thumbnailMutex); thumbnailCache.insert(entry.filename, thumbnail); |