From 38f05ed5552329fe79743ed4caace8313442d3ed Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 24 Feb 2017 17:10:33 +0100
Subject: Compress synchronization requests

---
 framework/domain/maillistmodel.cpp | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'framework/domain/maillistmodel.cpp')

diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index 58a6b384..c6897990 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -27,6 +27,8 @@ MailListModel::MailListModel(QObject *parent)
 {
     setDynamicSortFilter(true);
     sort(0, Qt::DescendingOrder);
+    connect(&mFetchTimer, &QTimer::timeout, this, &MailListModel::fetch);
+    mFetchTimer.setSingleShot(true);
 }
 
 MailListModel::~MailListModel()
@@ -71,12 +73,29 @@ static QString join(const QList<Sink::ApplicationDomain::Mail::Contact> &contact
     return list.join(", ");
 }
 
-void MailListModel::fetchMail(Sink::ApplicationDomain::Mail::Ptr mail) const
+void MailListModel::fetchMail(Sink::ApplicationDomain::Mail::Ptr mail)
 {
     if (mail && !mail->getFullPayloadAvailable() && !mFetchedMails.contains(mail->identifier())) {
         qDebug() << "Fetching mail: " << mail->identifier() << mail->getSubject();
         mFetchedMails.insert(mail->identifier());
-        Sink::Store::synchronize(Sink::SyncScope{*mail}).exec();
+        mMailsToFetch << *mail;
+        //TODO it would be nicer if Sink could just transparently merge synchronization requeusts.
+        if (!mFetchTimer.isActive()) {
+            mFetchTimer.start(50);
+        }
+    }
+}
+
+void MailListModel::fetch()
+{
+    if (!mMailsToFetch.isEmpty()) {
+        auto first = mMailsToFetch.first();
+        auto scope = Sink::SyncScope{first};
+        for (const auto &m : mMailsToFetch) {
+            scope.filter(m.identifier());
+        }
+        Sink::Store::synchronize(scope).exec();
+        mMailsToFetch.clear();
     }
 }
 
@@ -113,7 +132,7 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
             return QVariant::fromValue(mail);
         case MimeMessage:
             if (mFetchMails) {
-                fetchMail(mail);
+                const_cast<MailListModel*>(this)->fetchMail(mail);
             }
             return mail->getMimeMessage();
         case ThreadSize:
-- 
cgit v1.2.3