X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuimessageprocessor.cpp;h=9399d1f00f5ce88ec0593ff08ec62f139c4fcac4;hp=e110d61ea18ed01d7a409d8075109ad63d4b1863;hb=17b8c981d7c47800392b7fd1c043c5ac1bcb19ef;hpb=efa00e5a912c34c37bcc6dad7b8bc6e3a6f3e4fb diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp index e110d61e..9399d1f0 100644 --- a/src/qtui/qtuimessageprocessor.cpp +++ b/src/qtui/qtuimessageprocessor.cpp @@ -21,21 +21,163 @@ #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), + _processing(false), + _processMode(TimerBased), + _msgsProcessed(0), + _msgCount(0) +{ + NotificationSettings notificationSettings; + _highlightNick = notificationSettings.highlightNick(); + highlightListChanged(notificationSettings.highlightList()); + notificationSettings.notify("highlightList", this, SLOT(highlightListChanged(const QVariant &))); + notificationSettings.notify("highlightNick", this, SLOT(highlightNickChanged(const QVariant &))); + + _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) { + QList::iterator msgIter = msgs.begin(); + QList::iterator msgIterEnd = msgs.end(); + while(msgIter != msgIterEnd) { + checkForHighlight(*msgIter); + postProcess(*msgIter); + msgIter++; + } + Client::messageModel()->insertMessages(msgs); + return; + + + if(msgs.isEmpty()) return; + _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::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::processMessages(QList &msgs) { - foreach(Message msg, msgs) { - Client::checkForHighlight(msg); - Client::messageModel()->insertMessage(msg); +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); + } } } + +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(_highlightNick == NotificationSettings::CurrentNick) { + nickList << net->myNick(); + } else if(_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; + } + } + + for(int i = 0; i < _highlightRules.count(); i++) { + const HighlightRule &rule = _highlightRules[i]; + if(!rule.isEnabled) + continue; + + QRegExp userRegExp; + if(rule.isRegExp) { + userRegExp = QRegExp(rule.name, rule.caseSensitive); + } else { + userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(rule.name) + "(\\W.*)?$", rule.caseSensitive); + } + if(userRegExp.exactMatch(msg.contents())) { + msg.setFlags(msg.flags() | Message::Highlight); + return; + } + } + } +} + +void QtUiMessageProcessor::highlightListChanged(const QVariant &variant) { + QVariantList varList = variant.toList(); + + _highlightRules.clear(); + QVariantList::const_iterator iter = varList.constBegin(); + QVariantList::const_iterator iterEnd = varList.constEnd(); + while(iter != iterEnd) { + QVariantMap rule; + _highlightRules << HighlightRule(rule["name"].toString(), + rule["enable"].toBool(), + rule["cs"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive, + rule["regex"].toBool()); + iter++; + } +} + +void QtUiMessageProcessor::highlightNickChanged(const QVariant &variant) { + _highlightNick = (NotificationSettings::HighlightNickType)variant.toInt(); +}