X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuimessageprocessor.cpp;h=a9209ae7b751d9aecc83af045a290e3da35b6b2c;hp=54ee5702f95c97e88429ee9e6294bb420b3c1101;hb=0d3d7a861472313710b51c8d19e81af56e2208a1;hpb=9950dd55446bedbccba1e7a27c4d042fb896d3c6

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 54ee5702..a9209ae7 100644
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -26,20 +26,76 @@
 #include "messagemodel.h"
 #include "network.h"
 
-QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {
+const int progressUpdateDelay = 100;  // ms between progress signal updates
 
+QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) : AbstractMessageProcessor(parent) {
+  _msgsProcessed = _msgCount = 0;
+  _processing = false;
+  _processMode = TimerBased;
+  _processTimer.setInterval(0);
+  connect(&_processTimer, SIGNAL(timeout()), this, SLOT(processNextMessage()));
+}
 
+void QtUiMessageProcessor::reset() {
+  if(processMode() == TimerBased) {
+    if(_processTimer.isActive()) _processTimer.stop();
+    _processing = false;
+    _currentBatch.clear();
+    _processQueue.clear();
+  }
 }
 
-void QtUiMessageProcessor::processMessage(Message &msg) {
+void QtUiMessageProcessor::process(Message &msg) {
   checkForHighlight(msg);
   Client::messageModel()->insertMessage(msg);
+  postProcess(msg);
+}
+
+void QtUiMessageProcessor::process(QList<Message> &msgs) {
+  _processQueue.append(msgs);
+  _msgCount += msgs.count();
+  if(!isProcessing()) startProcessing();
+  else updateProgress();
+}
+
+void QtUiMessageProcessor::startProcessing() {
+  if(processMode() == TimerBased) {
+    if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
+    _processing = true;
+    _msgsProcessed = 0;
+    _msgCount = _currentBatch.count();
+    foreach(QList<Message> msglist, _processQueue) _msgCount += msglist.count();
+    updateProgress();
+    if(!_processTimer.isActive()) _processTimer.start();
+  }
 }
 
-void QtUiMessageProcessor::processMessages(QList<Message> &msgs) {
-  foreach(Message msg, msgs) {
-    checkForHighlight(msg);
-    Client::messageModel()->insertMessage(msg);
+void QtUiMessageProcessor::processNextMessage() {
+  if(_currentBatch.isEmpty()) {
+    if(_processQueue.isEmpty()) {
+      _processTimer.stop();
+      _processing = false;
+      _msgsProcessed = _msgCount = 0;
+      updateProgress();
+      return;
+    }
+    _currentBatch = _processQueue.takeFirst();
+  }
+  Message msg = _currentBatch.takeFirst();
+  process(msg);
+  _msgsProcessed++;
+  updateProgress();
+}
+
+void QtUiMessageProcessor::updateProgress(bool start) {
+  if(start) {
+    _progressTimer.start();
+    emit progressUpdated(_msgsProcessed, _msgCount);
+  } else {
+    if(_msgCount == 0 || _progressTimer.elapsed() >= progressUpdateDelay) {
+      _progressTimer.restart();
+      emit progressUpdated(_msgsProcessed, _msgCount);
+    }
   }
 }