From 52056a79fa94117ce0fc8f388458ceb48cc3be54 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 26 Aug 2019 01:24:56 +0200
Subject: Try to reduce memory usage by reusing avatar pixmaps

---
 src/AvatarProvider.cpp | 55 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 9 deletions(-)

(limited to 'src/AvatarProvider.cpp')

diff --git a/src/AvatarProvider.cpp b/src/AvatarProvider.cpp
index 57b61c75..277a4030 100644
--- a/src/AvatarProvider.cpp
+++ b/src/AvatarProvider.cpp
@@ -16,30 +16,44 @@
  */
 
 #include <QBuffer>
+#include <QPixmapCache>
 #include <memory>
+#include <unordered_map>
 
 #include "AvatarProvider.h"
 #include "Cache.h"
 #include "Logging.h"
 #include "MatrixClient.h"
 
-namespace AvatarProvider {
+static QPixmapCache avatar_cache;
 
+namespace AvatarProvider {
 void
-resolve(const QString &room_id, const QString &user_id, QObject *receiver, AvatarCallback callback)
+resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback callback)
 {
-        const auto key       = QString("%1 %2").arg(room_id).arg(user_id);
-        const auto avatarUrl = Cache::avatarUrl(room_id, user_id);
+        avatar_cache.setCacheLimit(1024 * 1024);
 
-        if (!Cache::AvatarUrls.contains(key) || !cache::client())
+        const auto cacheKey = avatarUrl + "_size_" + size;
+
+        if (!cache::client())
                 return;
 
         if (avatarUrl.isEmpty())
                 return;
 
+        QPixmap pixmap;
+        if (avatar_cache.find(cacheKey, pixmap)) {
+                nhlog::net()->info("cached pixmap {}", avatarUrl.toStdString());
+                callback(pixmap);
+                return;
+        }
+
         auto data = cache::client()->image(avatarUrl);
         if (!data.isNull()) {
-                callback(QImage::fromData(data));
+                pixmap.loadFromData(data);
+                avatar_cache.insert(cacheKey, pixmap);
+                nhlog::net()->info("loaded pixmap from disk cache {}", avatarUrl.toStdString());
+                callback(pixmap);
                 return;
         }
 
@@ -47,7 +61,12 @@ resolve(const QString &room_id, const QString &user_id, QObject *receiver, Avata
         QObject::connect(proxy.get(),
                          &AvatarProxy::avatarDownloaded,
                          receiver,
-                         [callback](const QByteArray &data) { callback(QImage::fromData(data)); });
+                         [callback, cacheKey](const QByteArray &data) {
+                                 QPixmap pm;
+                                 pm.loadFromData(data);
+                                 avatar_cache.insert(cacheKey, pm);
+                                 callback(pm);
+                         });
 
         mtx::http::ThumbOpts opts;
         opts.width   = 256;
@@ -67,8 +86,26 @@ resolve(const QString &room_id, const QString &user_id, QObject *receiver, Avata
 
                   cache::client()->saveImage(opts.mxc_url, res);
 
-                  auto data = QByteArray(res.data(), res.size());
-                  emit proxy->avatarDownloaded(data);
+                  nhlog::net()->info("downloaded pixmap {}", opts.mxc_url);
+
+                  emit proxy->avatarDownloaded(QByteArray(res.data(), res.size()));
           });
 }
+
+void
+resolve(const QString &room_id,
+        const QString &user_id,
+        int size,
+        QObject *receiver,
+        AvatarCallback callback)
+{
+        const auto key       = QString("%1 %2").arg(room_id).arg(user_id);
+        const auto avatarUrl = Cache::avatarUrl(room_id, user_id);
+        const auto cacheKey  = avatarUrl + "_size_" + size;
+
+        if (!Cache::AvatarUrls.contains(key) || !cache::client())
+                return;
+
+        resolve(avatarUrl, size, receiver, callback);
+}
 }
-- 
cgit 1.5.1


From c5f0c3221ff54477d8f12a348820e903e5e9b5ff Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 28 Aug 2019 08:21:07 +0200
Subject: Fix usage of deprecated find

---
 src/AvatarProvider.cpp | 2 +-
 src/ui/Avatar.h        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/AvatarProvider.cpp')

diff --git a/src/AvatarProvider.cpp b/src/AvatarProvider.cpp
index 277a4030..ec745c04 100644
--- a/src/AvatarProvider.cpp
+++ b/src/AvatarProvider.cpp
@@ -42,7 +42,7 @@ resolve(const QString &avatarUrl, int size, QObject *receiver, AvatarCallback ca
                 return;
 
         QPixmap pixmap;
-        if (avatar_cache.find(cacheKey, pixmap)) {
+        if (avatar_cache.find(cacheKey, &pixmap)) {
                 nhlog::net()->info("cached pixmap {}", avatarUrl.toStdString());
                 callback(pixmap);
                 return;
diff --git a/src/ui/Avatar.h b/src/ui/Avatar.h
index 0f8678c7..a643c8c4 100644
--- a/src/ui/Avatar.h
+++ b/src/ui/Avatar.h
@@ -22,7 +22,6 @@ public:
         void setImage(const QString &avatar_url);
         void setImage(const QString &room, const QString &user);
         void setLetter(const QString &letter);
-        //        void setSize(int size);
         void setTextColor(const QColor &color);
 
         QColor backgroundColor() const;
-- 
cgit 1.5.1