X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientbacklogmanager.cpp;h=f28913fc6cd741ec64f43b28ae208c89cf8f6ce1;hp=b485726d6cf60054583094336c15a867043b0630;hb=8f0946673bc3edc84b6f13e16cbe8ece912b4a3b;hpb=954b1a6f53da55f9713fb4e75a2fb46dae7d9df8

diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp
index b485726d..f28913fc 100644
--- a/src/client/clientbacklogmanager.cpp
+++ b/src/client/clientbacklogmanager.cpp
@@ -21,15 +21,15 @@
 #include "clientbacklogmanager.h"
 
 #include "abstractmessageprocessor.h"
+#include "backlogsettings.h"
 #include "backlogrequester.h"
 #include "client.h"
 
-#include <QDebug>
 #include <ctime>
 
 ClientBacklogManager::ClientBacklogManager(QObject *parent)
   : BacklogManager(parent),
-    _buffer(true)
+    _requester(0)
 {
 }
 
@@ -40,46 +40,62 @@ void ClientBacklogManager::receiveBacklog(BufferId bufferId, int lastMsgs, int o
   if(msgs.isEmpty())
     return;
 
-  //QTime start = QTime::currentTime();
-  QList<Message> msglist;
+  MessageList 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();
+  if(isBuffering()) {
+    if(!_requester->buffer(bufferId, msglist)) {
+      // this was the last part to buffer
+      stopBuffering();
     }
   } else {
-    Client::messageProcessor()->process(msglist);
+    dispatchMessages(msglist);
   }
-  //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
 }
 
-QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, int lastMsgs, int offset) {
-  if(_buffer)
-    _buffersWaiting << bufferId;
+void ClientBacklogManager::requestInitialBacklog() {
+  if(_requester) {
+    qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
+    return;
+  }
 
-  return BacklogManager::requestBacklog(bufferId, lastMsgs, offset);
+  BacklogSettings settings;
+  switch(settings.requesterType()) {
+  case BacklogRequester::GlobalUnread:
+  case BacklogRequester::PerBufferUnread:
+  case BacklogRequester::PerBufferFixed:
+  default:
+    _requester = new FixedBacklogRequester(this);
+  };
+
+  _requester->requestBacklog();
 }
 
-void ClientBacklogManager::requestInitialBacklog() {
-  FixedBacklogRequester backlogRequester(this);
-  backlogRequester.requestBacklog();
+void ClientBacklogManager::stopBuffering() {
+  Q_ASSERT(_requester);
+
+  dispatchMessages(_requester->bufferedMessages(), true);
+
+  delete _requester;
+  _requester = 0;
+}
+
+bool ClientBacklogManager::isBuffering() {
+  return _requester && _requester->isBuffering();
 }
 
-void ClientBacklogManager::reset() {
-  _buffer = true;
-  _messageBuffer.clear();
-  _buffersWaiting.clear();
+void ClientBacklogManager::dispatchMessages(const MessageList &messages, bool sort) {
+  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(msgs.count()).arg((float)(end_t - start_t) / CLOCKS_PER_SEC));
 }