Compress synchronization requests

2 files changed, 30 insertions, 5 deletions

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:
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index af079a1b..1fd0ef5e 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -25,6 +25,7 @@
 #include <QSortFilterProxyModel>
 #include <QSharedPointer>
 #include <QStringList>
+#include <QTimer>
 
 class MailListModel : public QSortFilterProxyModel
 {
@@ -69,11 +70,16 @@ public:
     void setMail(const QVariant &mail);
     QVariant mail() const;
 
+private slots:
+    void fetch();
+
 private:
-    void fetchMail(Sink::ApplicationDomain::Mail::Ptr mail) const;
+    void fetchMail(Sink::ApplicationDomain::Mail::Ptr mail);
 
     QSharedPointer<QAbstractItemModel> m_model;
     bool mFetchMails = false;
-    mutable QSet<QByteArray> mFetchedMails;
+    QSet<QByteArray> mFetchedMails;
+    QList<Sink::ApplicationDomain::Mail> mMailsToFetch;
     QByteArray mCurrentQueryItem;
+    QTimer mFetchTimer;
 };