FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

image caching in lite version now takes size into account

Browse Source
This commit is contained in:
Martin Rotter 2024-09-30 14:38:56 +02:00
parent 58a8fb70e7
commit 4e698c983a
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.cpp
View File

@ -83,17 +83,34 @@ QVariant TextBrowserViewer::loadOneResource(int type, const QUrl& name) {
} }
// Resources are enabled and we already have the resource. // Resources are enabled and we already have the resource.
QByteArray resource_data = m_loadedResources.value(resolved_name); int acceptable_width = int(width() * ACCEPTABLE_IMAGE_PERCENTUAL_WIDTH);
QMap<int, QByteArray>& resource_data_all_sizes = m_loadedResources[resolved_name];
QImage img; QImage img;
if (resource_data.isEmpty()) { qDebugNN << LOGSEC_GUI << "Picture" << QUOTE_W_SPACE(name)
<< "has these sizes cached:" << NONQUOTE_W_SPACE_DOT(resource_data_all_sizes.keys());
if (resource_data_all_sizes.isEmpty()) {
img = m_placeholderImageError.toImage(); img = m_placeholderImageError.toImage();
} }
else { else {
img = QImage::fromData(m_loadedResources.value(resolved_name)); // Now, we either select specifically sized picture, or default one.
QByteArray resource_data;
if (resource_data_all_sizes.contains(acceptable_width)) {
// We have picture with this exact size. The picture was likely downsized
// to this size before.
resource_data = resource_data_all_sizes.value(acceptable_width);
}
else {
// We only have default size or not desired size. Return initial picture.
resource_data = resource_data_all_sizes.value(0);
}
img = QImage::fromData(resource_data);
} }
int acceptable_width = int(width() * ACCEPTABLE_IMAGE_PERCENTUAL_WIDTH);
int img_width = img.width(); int img_width = img.width();
if (img_width > acceptable_width) { if (img_width > acceptable_width) {
@ -111,7 +128,7 @@ QVariant TextBrowserViewer::loadOneResource(int type, const QUrl& name) {
if (img.save(&save_buf, "PNG", 100)) { if (img.save(&save_buf, "PNG", 100)) {
save_buf.close(); save_buf.close();
m_loadedResources.insert(resolved_name, save_arr); resource_data_all_sizes.insert(acceptable_width, save_arr);
} }
else { else {
qWarningNN << LOGSEC_GUI << "Failed to save modified image" << QUOTE_W_SPACE(name) << "to cache."; qWarningNN << LOGSEC_GUI << "Failed to save modified image" << QUOTE_W_SPACE(name) << "to cache.";
@ -544,12 +561,19 @@ void TextBrowserViewer::resourceDownloaded(const QUrl& url,
int http_code, int http_code,
const QByteArray& contents) { const QByteArray& contents) {
Q_UNUSED(http_code) Q_UNUSED(http_code)
if (!m_loadedResources.contains(url)) {
m_loadedResources.insert(url, QMap<int, QByteArray>());
}
QMap<int, QByteArray>& resource_data_all_sizes = m_loadedResources[url];
resource_data_all_sizes.clear();
if (status == QNetworkReply::NetworkError::NoError) { if (status == QNetworkReply::NetworkError::NoError) {
m_loadedResources.insert(url, contents); resource_data_all_sizes.insert(0, contents);
} }
else { else {
m_loadedResources.insert(url, {}); resource_data_all_sizes.insert(0, {});
} }
downloadNextNeededResource(); downloadNextNeededResource();

4
src/librssguard/gui/webviewers/qtextbrowser/textbrowserviewer.h
View File

@ -106,7 +106,9 @@ class RSSGUARD_DLLSPEC TextBrowserViewer : public QTextBrowser, public WebViewer
QList<QUrl> m_neededResources; // All URLs here must be resolved. QList<QUrl> m_neededResources; // All URLs here must be resolved.
Downloader* m_resourceDownloader; Downloader* m_resourceDownloader;
QThread* m_resourceDownloaderThread; QThread* m_resourceDownloaderThread;
QMap<QUrl, QByteArray> m_loadedResources; // All URLs here must be resolved.
// Contains list of precisely sized images per each url.
QMap<QUrl, QMap<int, QByteArray>> m_loadedResources; // All URLs here must be resolved.
QPixmap m_placeholderImage; QPixmap m_placeholderImage;
QPixmap m_placeholderImageError; QPixmap m_placeholderImageError;
QUrl m_currentUrl; QUrl m_currentUrl;