Skip to content

Commit

Permalink
fix: improve looks of errors in thumbnail loading
Browse files Browse the repository at this point in the history
  • Loading branch information
Bionus committed Nov 14, 2022
1 parent f2a0f19 commit ac41f0d
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions src/gui/src/tabs/image-preview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,17 @@ void ImagePreview::finishedLoadingPreview()

// Loading error
if (m_reply->error() != NetworkReply::NetworkError::NoError) {
// Retry with JPG in case the original thumbnail had a weird extension
const QString ext = getExtension(m_reply->url());
if (!ext.isEmpty() && ext != "jpg") {
log(QStringLiteral("Error loading thumbnail (%1), new try with extension JPG").arg(m_reply->errorString()), Logger::Warning);
m_thumbnailUrl = setExtension(m_reply->url(), "jpg");
load();
} else {
log(QStringLiteral("Error loading thumbnail (%1)").arg(m_reply->errorString()), Logger::Error);
return;
}

log(QStringLiteral("Error loading thumbnail (%1)").arg(m_reply->errorString()), Logger::Error);
finishedLoading();
return;
}

Expand All @@ -152,11 +155,8 @@ void ImagePreview::finishedLoadingPreview()
thumbnail.loadFromData(m_reply->readAll());
if (thumbnail.isNull()) {
log(QStringLiteral("One of the thumbnails is empty (`%1`).").arg(m_image->url(Image::Size::Thumbnail).toString()), Logger::Error);
if (m_image->hasTag(QStringLiteral("flash"))) {
thumbnail.load(QStringLiteral(":/images/flash.png"));
} else {
return;
}
finishedLoading();
return;
}
m_image->setPreviewImage(thumbnail);

Expand Down Expand Up @@ -186,7 +186,11 @@ void ImagePreview::finishedLoading()

const QPixmap &thumbnail = m_image->previewImage();
if (thumbnail.isNull()) {
l->scale(QPixmap(":/images/noimage.png"), QSize(imageSize, imageSize));
if (m_image->hasTag(QStringLiteral("flash"))) {
l->scale(QPixmap(":/images/flash.png"), QSize(imageSize, imageSize));
} else {
l->scale(QPixmap(":/images/noimage.png"), QSize(imageSize, imageSize));
}
} else {
l->scale(thumbnail, QSize(imageSize, imageSize));
}
Expand Down

0 comments on commit ac41f0d

Please sign in to comment.