X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuimessageprocessor.cpp;h=a9209ae7b751d9aecc83af045a290e3da35b6b2c;hp=e110d61ea18ed01d7a409d8075109ad63d4b1863;hb=0d3d7a861472313710b51c8d19e81af56e2208a1;hpb=efa00e5a912c34c37bcc6dad7b8bc6e3a6f3e4fb diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp index e110d61e..a9209ae7 100644 --- a/src/qtui/qtuimessageprocessor.cpp +++ b/src/qtui/qtuimessageprocessor.cpp @@ -21,21 +21,124 @@ #include "qtuimessageprocessor.h" #include "client.h" +#include "clientsettings.h" +#include "identity.h" #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) { - Client::checkForHighlight(msg); +void QtUiMessageProcessor::process(Message &msg) { + checkForHighlight(msg); Client::messageModel()->insertMessage(msg); + postProcess(msg); +} + +void QtUiMessageProcessor::process(QList &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 msglist, _processQueue) _msgCount += msglist.count(); + updateProgress(); + if(!_processTimer.isActive()) _processTimer.start(); + } } -void QtUiMessageProcessor::processMessages(QList &msgs) { - foreach(Message msg, msgs) { - Client::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); + } + } +} + +// TODO optimize checkForHighlight +void QtUiMessageProcessor::checkForHighlight(Message &msg) { + if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self))) + return; + + NotificationSettings notificationSettings; + const Network *net = Client::network(msg.bufferInfo().networkId()); + if(net && !net->myNick().isEmpty()) { + QStringList nickList; + if(notificationSettings.highlightNick() == NotificationSettings::CurrentNick) { + nickList << net->myNick(); + } else if(notificationSettings.highlightNick() == NotificationSettings::AllNicks) { + const Identity *myIdentity = Client::identity(net->identity()); + if(myIdentity) + nickList = myIdentity->nicks(); + } + foreach(QString nickname, nickList) { + QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$"); + if(nickRegExp.exactMatch(msg.contents())) { + msg.setFlags(msg.flags() | Message::Highlight); + return; + } + } + + foreach(QVariant highlight, notificationSettings.highlightList()) { + QVariantMap highlightRule = highlight.toMap(); + if(!highlightRule["enable"].toBool()) + continue; + Qt::CaseSensitivity caseSensitivity = highlightRule["cs"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive; + QString name = highlightRule["name"].toString(); + QRegExp userRegExp; + if(highlightRule["regex"].toBool()) { + userRegExp = QRegExp(name, caseSensitivity); + } else { + userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$", caseSensitivity); + } + if(userRegExp.exactMatch(msg.contents())) { + msg.setFlags(msg.flags() | Message::Highlight); + return; + } + } } }