X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuimessageprocessor.cpp;h=de35336a5c1a583721ff5488100e99a53d862e51;hp=3aa3acd267b1bd7b189b19c14911cf7f8abadd72;hb=16f22647e6890d3eb8c3e94f7a0700e12fa29e44;hpb=5bd4e3fcf31a7a337f91b3bba86bd237aa5e7ed6 diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp index 3aa3acd2..de35336a 100644 --- a/src/qtui/qtuimessageprocessor.cpp +++ b/src/qtui/qtuimessageprocessor.cpp @@ -1,22 +1,22 @@ /*************************************************************************** -* Copyright (C) 2005-09 by the Quassel Project * -* devel@quassel-irc.org * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) version 3. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the * -* Free Software Foundation, Inc., * -* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * -***************************************************************************/ + * Copyright (C) 2005-2016 by the Quassel Project * + * devel@quassel-irc.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) version 3. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ #include "qtuimessageprocessor.h" @@ -26,145 +26,178 @@ #include "messagemodel.h" #include "network.h" -const int progressUpdateDelay = 100; // ms between progress signal updates - QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent) - : AbstractMessageProcessor(parent), + : AbstractMessageProcessor(parent), _processing(false), _processMode(TimerBased) { - NotificationSettings notificationSettings; - _nicksCaseSensitive = notificationSettings.nicksCaseSensitive(); - _highlightNick = notificationSettings.highlightNick(); - highlightListChanged(notificationSettings.highlightList()); - notificationSettings.notify("Highlights/NicksCaseSensitive", this, SLOT(nicksCaseSensitiveChanged(const QVariant &))); - notificationSettings.notify("Highlights/CustomList", this, SLOT(highlightListChanged(const QVariant &))); - notificationSettings.notify("Highlights/HighlightNick", this, SLOT(highlightNickChanged(const QVariant &))); - - _processTimer.setInterval(0); - connect(&_processTimer, SIGNAL(timeout()), this, SLOT(processNextMessage())); + NotificationSettings notificationSettings; + _nicksCaseSensitive = notificationSettings.nicksCaseSensitive(); + _highlightNick = notificationSettings.highlightNick(); + highlightListChanged(notificationSettings.highlightList()); + notificationSettings.notify("Highlights/NicksCaseSensitive", this, SLOT(nicksCaseSensitiveChanged(const QVariant &))); + notificationSettings.notify("Highlights/CustomList", this, SLOT(highlightListChanged(const QVariant &))); + notificationSettings.notify("Highlights/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::process(Message &msg) { - checkForHighlight(msg); - Client::messageModel()->insertMessage(msg); - postProcess(msg); +void QtUiMessageProcessor::reset() +{ + if (processMode() == TimerBased) { + if (_processTimer.isActive()) _processTimer.stop(); + _processing = false; + _currentBatch.clear(); + _processQueue.clear(); + } } -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); - if(!isProcessing()) - startProcessing(); -} -void QtUiMessageProcessor::startProcessing() { - if(processMode() == TimerBased) { - if(_currentBatch.isEmpty() && _processQueue.isEmpty()) - return; - _processing = true; - if(!_processTimer.isActive()) - _processTimer.start(); - } +void QtUiMessageProcessor::process(Message &msg) +{ + if (!Client::coreFeatures().testFlag(Quassel::Feature::CoreSideHighlights)) + checkForHighlight(msg); + preProcess(msg); + Client::messageModel()->insertMessage(msg); } -void QtUiMessageProcessor::processNextMessage() { - if(_currentBatch.isEmpty()) { - if(_processQueue.isEmpty()) { - _processTimer.stop(); - _processing = false; - return; + +void QtUiMessageProcessor::process(QList &msgs) +{ + QList::iterator msgIter = msgs.begin(); + QList::iterator msgIterEnd = msgs.end(); + while (msgIter != msgIterEnd) { + if (!Client::coreFeatures().testFlag(Quassel::Feature::CoreSideHighlights)) + checkForHighlight(*msgIter); + preProcess(*msgIter); + ++msgIter; } - _currentBatch = _processQueue.takeFirst(); - } - Message msg = _currentBatch.takeFirst(); - process(msg); + Client::messageModel()->insertMessages(msgs); + return; + + if (msgs.isEmpty()) return; + _processQueue.append(msgs); + if (!isProcessing()) + startProcessing(); } -void QtUiMessageProcessor::checkForHighlight(Message &msg) { - if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self))) - return; - // TODO: Cache this (per network) - 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(); +void QtUiMessageProcessor::startProcessing() +{ + if (processMode() == TimerBased) { + if (_currentBatch.isEmpty() && _processQueue.isEmpty()) + return; + _processing = true; + if (!_processTimer.isActive()) + _processTimer.start(); } - foreach(QString nickname, nickList) { - QRegExp nickRegExp("\\b" + QRegExp::escape(nickname) + "(\\W|\\b|$)", // + "\\b", this does not seem to work for trailing ` -> upstream bug? - _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); - if(nickRegExp.indexIn(msg.contents()) >= 0) { - msg.setFlags(msg.flags() | Message::Highlight); - return; - } +} + + +void QtUiMessageProcessor::processNextMessage() +{ + if (_currentBatch.isEmpty()) { + if (_processQueue.isEmpty()) { + _processTimer.stop(); + _processing = false; + return; + } + _currentBatch = _processQueue.takeFirst(); } + Message msg = _currentBatch.takeFirst(); + process(msg); +} - for(int i = 0; i < _highlightRules.count(); i++) { - const HighlightRule &rule = _highlightRules.at(i); - if(!rule.isEnabled) - continue; - - bool match = false; - if(rule.isRegExp) { - QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive); - match = rx.exactMatch(msg.contents()); - } else { - QRegExp rx("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive); - match = (rx.indexIn(msg.contents()) >= 0); - } - if(match) { - msg.setFlags(msg.flags() | Message::Highlight); + +void QtUiMessageProcessor::checkForHighlight(Message &msg) +{ + if (!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self))) return; - } + + // TODO: Cache this (per network) + 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(); + if (!nickList.contains(net->myNick())) + nickList.prepend(net->myNick()); + } + foreach(QString nickname, nickList) { + QRegExp nickRegExp("(^|\\W)" + QRegExp::escape(nickname) + "(\\W|$)", _nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); + if (nickRegExp.indexIn(stripFormatCodes(msg.contents())) >= 0) { + msg.setFlags(msg.flags() | Message::Highlight); + return; + } + } + + for (int i = 0; i < _highlightRules.count(); i++) { + const HighlightRule &rule = _highlightRules.at(i); + if (!rule.isEnabled) + continue; + + if (rule.chanName.size() > 0 && rule.chanName.compare(".*") != 0) { + if (rule.chanName.startsWith("!")) { + QRegExp rx(rule.chanName.mid(1), Qt::CaseInsensitive); + if (rx.exactMatch(msg.bufferInfo().bufferName())) + continue; + } + else { + QRegExp rx(rule.chanName, Qt::CaseInsensitive); + if (!rx.exactMatch(msg.bufferInfo().bufferName())) + continue; + } + } + + QRegExp rx; + if (rule.isRegExp) { + rx = QRegExp(rule.name, rule.caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); + } + else { + rx = QRegExp("(^|\\W)" + QRegExp::escape(rule.name) + "(\\W|$)", rule.caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); + } + bool match = (rx.indexIn(stripFormatCodes(msg.contents())) >= 0); + if (match) { + msg.setFlags(msg.flags() | Message::Highlight); + return; + } + } } - } } -void QtUiMessageProcessor::nicksCaseSensitiveChanged(const QVariant &variant) { - _nicksCaseSensitive = variant.toBool(); + +void QtUiMessageProcessor::nicksCaseSensitiveChanged(const QVariant &variant) +{ + _nicksCaseSensitive = variant.toBool(); } -void QtUiMessageProcessor::highlightListChanged(const QVariant &variant) { - QVariantList varList = variant.toList(); - - _highlightRules.clear(); - QVariantList::const_iterator iter = varList.constBegin(); - while(iter != varList.constEnd()) { - QVariantMap rule = iter->toMap(); - _highlightRules << HighlightRule(rule["Name"].toString(), - rule["Enable"].toBool(), - rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive, - rule["RegEx"].toBool()); - iter++; - } + +void QtUiMessageProcessor::highlightListChanged(const QVariant &variant) +{ + QVariantList varList = variant.toList(); + + _highlightRules.clear(); + QVariantList::const_iterator iter = varList.constBegin(); + while (iter != varList.constEnd()) { + QVariantMap rule = iter->toMap(); + _highlightRules << HighlightRule(rule["Name"].toString(), + rule["Enable"].toBool(), + rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive, + rule["RegEx"].toBool(), + rule["Channel"].toString()); + ++iter; + } } -void QtUiMessageProcessor::highlightNickChanged(const QVariant &variant) { - _highlightNick = (NotificationSettings::HighlightNickType)variant.toInt(); + +void QtUiMessageProcessor::highlightNickChanged(const QVariant &variant) +{ + _highlightNick = (NotificationSettings::HighlightNickType)variant.toInt(); }