X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientbacklogmanager.cpp;h=32dbfde3d9d7d4eb292deea2871d54e781500e70;hp=5e60ef6442ce2e1bea9f10ab71fd0dfe82a6e86f;hb=1a45f16a9734820fba42fe1db3f38dd1eee49df6;hpb=fb44e08cc4f160cce624e39ceee2b8b9593f85a6

diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp
index 5e60ef64..32dbfde3 100644
--- a/src/client/clientbacklogmanager.cpp
+++ b/src/client/clientbacklogmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,64 +15,174 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "clientbacklogmanager.h"
 
 #include "abstractmessageprocessor.h"
+#include "backlogsettings.h"
 #include "backlogrequester.h"
 #include "client.h"
 
+#include <ctime>
+
 #include <QDebug>
 
+INIT_SYNCABLE_OBJECT(ClientBacklogManager)
 ClientBacklogManager::ClientBacklogManager(QObject *parent)
-  : BacklogManager(parent),
-    _buffer(true)
+    : BacklogManager(parent),
+    _requester(0),
+    _initBacklogRequested(false)
+{
+}
+
+
+QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional)
+{
+    _buffersRequested << bufferId;
+    return BacklogManager::requestBacklog(bufferId, first, last, limit, additional);
+}
+
+
+void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs)
+{
+    Q_UNUSED(first) Q_UNUSED(last) Q_UNUSED(limit) Q_UNUSED(additional)
+
+    emit messagesReceived(bufferId, msgs.count());
+
+    MessageList msglist;
+    foreach(QVariant v, msgs) {
+        Message msg = v.value<Message>();
+        msg.setFlags(msg.flags() | Message::Backlog);
+        msglist << msg;
+    }
+
+    if (isBuffering()) {
+        bool lastPart = !_requester->buffer(bufferId, msglist);
+        updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers());
+        if (lastPart) {
+            dispatchMessages(_requester->bufferedMessages(), true);
+            _requester->flushBuffer();
+        }
+    }
+    else {
+        dispatchMessages(msglist);
+    }
+}
+
+
+void ClientBacklogManager::receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs)
+{
+    Q_UNUSED(first) Q_UNUSED(last) Q_UNUSED(limit) Q_UNUSED(additional)
+
+    MessageList msglist;
+    foreach(QVariant v, msgs) {
+        Message msg = v.value<Message>();
+        msg.setFlags(msg.flags() | Message::Backlog);
+        msglist << msg;
+    }
+
+    dispatchMessages(msglist);
+}
+
+
+void ClientBacklogManager::requestInitialBacklog()
 {
+    if (_initBacklogRequested) {
+        Q_ASSERT(_requester);
+        qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
+        return;
+    }
+
+    BacklogSettings settings;
+    switch (settings.requesterType()) {
+    case BacklogRequester::GlobalUnread:
+        _requester = new GlobalUnreadBacklogRequester(this);
+        break;
+    case BacklogRequester::PerBufferUnread:
+        _requester = new PerBufferUnreadBacklogRequester(this);
+        break;
+    case BacklogRequester::PerBufferFixed:
+    default:
+        _requester = new FixedBacklogRequester(this);
+    };
+
+    _requester->requestInitialBacklog();
+    _initBacklogRequested = true;
+    if (_requester->isBuffering()) {
+        updateProgress(0, _requester->totalBuffers());
+    }
 }
 
-void ClientBacklogManager::receiveBacklog(BufferId bufferId, int lastMsgs, int offset, QVariantList msgs) {
-  Q_UNUSED(lastMsgs)
-  Q_UNUSED(offset)
-
-  if(msgs.isEmpty())
-    return;
-
-  //QTime start = QTime::currentTime();
-  QList<Message> msglist;
-  foreach(QVariant v, msgs) {
-    Message msg = v.value<Message>();
-    msg.setFlags(msg.flags() | Message::Backlog);
-    msglist << msg;
-  }
-
-  if(_buffer) {
-    _messageBuffer << msglist;
-    _buffersWaiting.remove(bufferId);
-    if(_buffersWaiting.isEmpty()) {
-      _buffer = false;
-      clock_t start_t = clock();
-      qSort(_messageBuffer);
-      Client::messageProcessor()->process(_messageBuffer);
-      clock_t end_t = clock();
-      qDebug() << "Processed" << _messageBuffer.count() << "Messages in" << (float)(end_t - start_t) / CLOCKS_PER_SEC << "seconds ==" << end_t - start_t << "clocks.";
-      _messageBuffer.clear();
+
+BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds)
+{
+    BufferIdList newBuffers;
+    QSet<BufferId> availableBuffers = Client::networkModel()->allBufferIds().toSet();
+    foreach(BufferId bufferId, bufferIds) {
+        if (_buffersRequested.contains(bufferId) || !availableBuffers.contains(bufferId))
+            continue;
+        newBuffers << bufferId;
     }
-  } else {
-    Client::messageProcessor()->process(msglist);
-  }
-  //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
+    return newBuffers;
 }
 
-QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, int lastMsgs, int offset) {
-  if(_buffer)
-    _buffersWaiting << bufferId;
 
-  return BacklogManager::requestBacklog(bufferId, lastMsgs, offset);
+void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds)
+{
+    // we ingore all backlogrequests until we had our initial request
+    if (!_initBacklogRequested) {
+        return;
+    }
+
+    if (!_requester) {
+        // during client start up this message is to be expected in some situations.
+        qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester.";
+        return;
+    }
+    switch (_requester->type()) {
+    case BacklogRequester::GlobalUnread:
+        break;
+    case BacklogRequester::PerBufferUnread:
+    case BacklogRequester::PerBufferFixed:
+    default:
+    {
+        BufferIdList buffers = filterNewBufferIds(bufferIds);
+        if (!buffers.isEmpty())
+            _requester->requestBacklog(buffers);
+    }
+    };
 }
 
-void ClientBacklogManager::requestInitialBacklog() {
-  FixedBacklogRequester backlogRequester(this);
-  backlogRequester.requestBacklog();
+
+bool ClientBacklogManager::isBuffering()
+{
+    return _requester && _requester->isBuffering();
+}
+
+
+void ClientBacklogManager::dispatchMessages(const MessageList &messages, bool sort)
+{
+    if (messages.isEmpty())
+        return;
+
+    MessageList msgs = messages;
+
+    clock_t start_t = clock();
+    if (sort)
+        qSort(msgs);
+    Client::messageProcessor()->process(msgs);
+    clock_t end_t = clock();
+
+    emit messagesProcessed(tr("Processed %1 messages in %2 seconds.").arg(messages.count()).arg((float)(end_t - start_t) / CLOCKS_PER_SEC));
+}
+
+
+void ClientBacklogManager::reset()
+{
+    delete _requester;
+    _requester = 0;
+    _initBacklogRequested = false;
+    _buffersRequested.clear();
 }