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

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 203397de..a9209ae7 100644
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -26,13 +26,25 @@
 #include "messagemodel.h"
 #include "network.h"
 
+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::process(Message &msg) {
   checkForHighlight(msg);
   Client::messageModel()->insertMessage(msg);
@@ -41,13 +53,19 @@ void QtUiMessageProcessor::process(Message &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();
   }
 }
@@ -57,12 +75,28 @@ void QtUiMessageProcessor::processNextMessage() {
     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);
+    }
+  }
 }
 
 // TODO optimize checkForHighlight